Commit graph

152 commits

Author SHA1 Message Date
Adrian
8570b2b58a fix fluid pipe sync, BuildCraft 7.0.4 2015-05-10 11:30:38 +02:00
asiekierka
36387f533f BuildCraft 7.0.3 2015-05-02 15:35:47 +02:00
asiekierka
df83af8e64 fix version in gradle build 2015-04-25 14:24:39 +02:00
asiekierka
3cb5a3de27 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-22 18:57:41 +02:00
asiekierka
4a72ddc20f 6.4.13 2015-04-22 18:51:12 +02:00
asiekierka
d559a92b24 update build.gradle 2015-04-22 16:26:27 +02:00
asiekierka
28bb9639e1 BuildCraft 6.4.12 2015-04-22 16:24:58 +02:00
asiekierka
8fd86877cb update build.gradle too 2015-04-12 14:31:08 +02:00
asiekierka
ed5fd2b375 BuildCraft 6.4.10 2015-04-11 08:41:23 +02:00
asiekierka
b291458e4a BuildCraft 6.4.9 2015-04-10 20:43:42 +02:00
asiekierka
180a020fc7 BuildCraft 6.4.8 2015-04-06 21:20:38 +02:00
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
4378884e78 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-01 16:28:29 +02:00
asiekierka
16d6770c07 BuildCraft 6.4.6 2015-04-01 16:21:30 +02:00
asiekierka
5adaf78a02 BuildCraft 6.4.5 2015-03-25 15:42:26 +01:00
asiekierka
df4e416532 forgot these 2015-03-23 23:19:26 +01:00
asiekierka
04fe3c31a7 BuildCraft 6.4.4 2015-03-22 00:34:34 +01:00
asiekierka
5541c8e7fd BuildCraft 6.4.3 2015-03-10 08:11:23 +01:00
asiekierka
e970f4b5ec fix version number in script - gah 2015-03-03 20:09:05 +01:00
asiekierka
9306baa0e8 BuildCraft 6.4.1 2015-02-26 22:49:15 +01:00
asiekierka
1f3a4ff2e6 BuildCraft 6.4.0 Beta 2015-02-22 22:35:22 +01:00
asiekierka
20313b1e7f BuildCraft 6.3.6 - hotfix 2015-02-06 20:19:31 +01:00
asiekierka
0dd57e7f27 BuildCraft 6.3.5 2015-02-06 19:39:24 +01:00
asiekierka
5771b6b9e7 BuildCraft 6.3.4, fix #2423 and #2419 2015-01-31 00:42:54 +01:00
asiekierka
3fca102985 BuildCraft 6.3.3 2015-01-23 09:18:07 +01:00
asiekierka
f8ae10e2f2 BuildCraft 6.3.2 2015-01-22 23:37:52 +01:00
asiekierka
be1d1f2fc9 fix version number 2015-01-10 18:46:08 +01:00
asiekierka
dd2e3ab3e9 BuildCraft 6.3.1 2015-01-10 17:31:33 +01:00
asiekierka
bfa726e928 BuildCraft 6.3.0 2015-01-06 15:20:28 +01:00
asiekierka
d007865b58 fix style 2014-12-28 15:08:42 +01:00
asiekierka
fba2a37941 BuildCraft 6.2.6, update RF API 2014-12-14 22:29:22 +01:00
asiekierka
87fffc2456 BuildCraft 6.2.5 2014-12-14 17:03:02 +01:00
asiekierka
01ad2501c9 BC 6.2.4, fix #2290 2014-12-10 23:41:55 +01:00
asiekierka
2538c3457c BuildCraft 6.2.3 2014-12-10 20:50:38 +01:00
asiekierka
63b1703e4e BuildCraft 6.2.2 2014-12-01 22:10:37 +01:00
asiekierka
5dcbf56c16 BuildCraft 6.2.1 2014-11-30 00:32:28 +01:00
asiekierka
7045964097 fix bugs, reduce quarry/builder/filler buffer 2014-11-27 12:13:56 +01:00
Adrian Siekierka
b93b1d0d1a BuildCraft 6.1.8 2014-11-10 21:04:50 +01:00
Adrian Siekierka
b0119f6d51 fix #2153, release BuildCraft 6.1.7 2014-11-07 19:09:10 +01:00
asiekierka
d0506b8a49 fix a lot of Builder bugginess 2014-11-01 22:25:29 +01:00
asiekierka
25aedffac3 update to 6.1.3, fix #2082 2014-10-23 14:48:02 +02:00
asiekierka
e5904e0316 BuildCraft 6.1.2 2014-10-18 15:45:43 +02:00
asiekierka
39100c40c4 use Forge build 1207 from now on 2014-10-18 15:29:56 +02:00
SpaceToad
cca8fd2c0c removed cofh from checked files 2014-09-04 21:24:24 +02:00
SpaceToad
1cacc0cd67 bumped version 2014-08-17 17:44:56 +02:00
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
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