SpaceToad
5812d4f0bf
Merge branch 'BuildCraft-5.1.x' into NextGen
...
Conflicts:
buildcraft_resources/assets/buildcraft/lang/en_US.lang
common/buildcraft/energy/BlockEngine.java
common/buildcraft/factory/BlockTank.java
common/buildcraft/transport/pipes/PipeItemsEmerald.java
2014-04-26 13:39:01 +02:00
SpaceToad
3fc344c9b9
Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x
2014-04-26 13:12:48 +02:00
SpaceToad
98d8861ea3
migrated to forge 60 and gradle 1.2
2014-04-26 13:12:28 +02:00
SpaceToad
09ec24852d
fixed previous check-in
2014-04-12 21:35:53 +02:00
SpaceToad
21a9f41d12
prepare release 6.0.6
2014-04-12 21:34:20 +02:00
SpaceToad
e0c11f248b
Merge branch 'BuildCraft-5.1.x' into NextGen
...
Conflicts:
build.gradle
2014-04-08 14:55:21 +02:00
SpaceToad
322f3c0eb1
fixed version number
2014-04-08 14:54:53 +02:00
Abrar Syed
9f55519528
removed buildNumber from the build.gradle file
2014-04-07 22:23:36 -05:00
SpaceToad
9fbd9cb7b2
provision for BC 6.0.5
2014-04-06 18:12:19 +02:00
SpaceToad
9e0a038197
prepare 6.0.4 release
2014-03-30 13:09:43 +02:00
SpaceToad
7b275c1455
fixed conflicts
2014-03-29 11:34:41 +01:00
SpaceToad
40a594ef23
fixed conflict
2014-03-29 11:33:01 +01:00
SpaceToad
ebebba3282
prepare 5.0.4 version
2014-03-22 15:49:09 +01:00
SpaceToad
1984eca2ab
prepare 6.0.3 release
2014-03-19 15:24:02 +01:00
SpaceToad
2d3d70f6db
Merge branch 'BuildCraft-5.1.x' into NextGen
2014-03-19 11:36:15 +01:00
SpaceToad
e34a4b25a4
Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x
2014-03-19 11:35:14 +01:00
AJ Fite
515ab78f22
Match build number to branch
...
Mostly for my CI server #1523
2014-03-19 00:44:49 -07:00
Abrar Syed
8eea3a74e9
fix maven uploading
2014-03-18 16:08:36 -05:00
SpaceToad
a1a114feb0
prepare 6.0.2 release
2014-03-16 15:55:57 +01:00
SpaceToad
699295e19b
prepare 6.0.1 release
2014-03-09 15:35:24 +01:00
SpaceToad
cc4a0eb7db
prepare experimental nextgen version
2014-03-05 20:51:37 +01:00
SpaceToad
182c7cf74f
marked 5.0.3 release
2014-03-02 17:27:44 +01:00
Cisien
b039726ef1
addFacade with an ItemStack of 0 would create a facade recipe without a block
...
fixed some spelling mistakes in build.grade
added IDEA project files to .gitignore
2014-02-23 15:24:49 -08:00
Chris
9aed7e7cba
Corrects srcDir property
...
Please validate this change doesn't impact other workspaces. I validated 'gradle build' and 'gradle idea'
In the IDEA workspace, the "Source Root" directory was incorrectly directed to common/buildcraft. This had to be changed to common in the IDEA workspace.
2014-02-20 20:58:53 -08:00
SpaceToad
30b00a3a2a
5.0.2 release
2014-02-19 08:37:12 +01:00
SpaceToad
f8311fd5d1
fixed build number
2014-02-18 08:34:24 +01:00
AbrarSyed
a665980842
fixed buildnumber mistake, accounted for change in localization repo
2014-02-17 16:53:43 -06:00
SpaceToad
983cd6fba7
version 5.0.1
2014-02-17 22:14:03 +01:00
AbrarSyed
507eb014af
Step 2: The Rebirth
2014-02-17 01:24:19 -06:00
