Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3080 commits 1 branch 0 tags 19 MiB
Commit graph

57 commits

Author SHA1 Message Date
SpaceToad
6c88ad2ae8 Started convergence on a pre-alpha release. 
Science book is deactivated.
Redstone parameter mechanics have been removed, all replaced by gates.
 2014-08-03 12:19:58 +02:00
SpaceToad
bb72ff14ec Merge branch '6.0.x' into 6.1.x 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-07-12 00:33:53 +02:00
SpaceToad
6ac6ea4734 prepare release 6.0.17 for Minecraft 1.7.10 2014-07-11 23:57:44 +02:00
SpaceToad
9d4465bbc5 Merge branch '6.0.x' into 6.1.x 2014-07-11 22:26:44 +02:00
SpaceToad
ab4114dbe6 Merge branch '5.0.x' into 6.0.x 
Conflicts:
	common/buildcraft/BuildCraftEnergy.java
 2014-07-11 22:26:29 +02:00
Andrew Dudney
f9e9c6cb26 Changed build.gradle to use RunDir, changed deprecated fluid localized name functionality, changed deprecated biome type desert to sandy. 2014-07-11 14:12:02 -06:00
SpaceToad
4c6e7bb39e Merge branch '6.0.x' into 6.1.x 
Conflicts:
	api/buildcraft/api/power/PowerHandler.java
	build.gradle
	common/buildcraft/core/robots/EntityRobotPicker.java
	common/buildcraft/factory/TileRefinery.java
	common/buildcraft/transport/TileGenericPipe.java
 2014-07-11 09:00:08 +02:00
SpaceToad
1791c485af Merge branch '5.0.x' into 6.0.x 
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java
 2014-07-11 08:49:38 +02:00
Parker
08dd853bf5 Bumped to Forge 1179 2014-07-10 16:59:18 -04:00
Parker Young
341ff4e972 Updated to 1.7.10 
This version isn't backwards compatiable because of changes in the CompressedStreamTools. I don't know if you want to push an update to the 5.0.x branch, but I thought I'd do it, just in case you did.
 2014-06-28 11:57:16 -04:00
Raul Tambre
df1e70cfd1 Updated to Forge 1121, fixed some typos, fix #1878 2014-06-13 12:20:59 +03:00
SpaceToad
7898637b33 prepare version 6.0.16 2014-05-31 18:16:42 +02:00
SpaceToad
917feacad8 prepare BuildCraft 5.0.6 2014-05-31 18:12:40 +02:00
SpaceToad
5be1d6031e fixed version number 2014-05-18 21:31:13 +02:00
SpaceToad
b63fb22db4 prepare 6.0.14 release 2014-05-18 16:00:46 +02:00
SpaceToad
2fddee9389 prepare 6.0.13 release 2014-05-13 21:26:19 +02:00
SpaceToad
af402df7f9 prepare 6.0.12 release 2014-05-11 18:47:48 +02:00
SpaceToad
9b02f71b54 prepare 6.0.11 release 2014-05-10 23:53:13 +02:00
SpaceToad
492b2805bf prepare 6.0.10 release 2014-05-06 23:34:58 +02:00
SpaceToad
2dd5eac515 prepare 6.0.9 version 2014-05-05 14:55:28 +02:00
SpaceToad
27a7d1390b Merge branch '5.0.x' into 6.0.x 2014-05-05 14:46:24 +02:00
jk-5
7e5fe9f7bb Fix checkstyle 2014-05-04 20:21:50 +02:00
Prototik
94e928de57 Enable checkstyle gradle plugin. 2014-05-04 12:06:32 +08:00
anti344
5d5cbd3372 Tweak for users without Localization installed. 2014-05-04 01:06:15 +03:00
SpaceToad
4def61f450 prepare 6.0.8 version 2014-05-03 20:17:12 +02:00
Prototik
11b0b412b7 Split api and main classes to different source sets. 
This means a separate api jar and no more inconsistencies between api
and core. (fix #1653)
 2014-04-30 21:03:12 +08:00
SpaceToad
877940fb70 prepare 6.0.7 version 2014-04-28 20:09:06 +02:00
SpaceToad
171b1d3edf prepare 5.0.5 version 2014-04-28 20:07:30 +02:00
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