Commit graph

102 commits

Author SHA1 Message Date
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
7f03a920bb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-22 16:26:50 +02:00
asiekierka
28bb9639e1 BuildCraft 6.4.12 2015-04-22 16:24:58 +02:00
asiekierka
d63d97a992 BuildCraft 7.0.1 Beta 2015-04-18 10:23:41 +02:00
asiekierka
a11a25456c add 7.0.1 changelog, fix pump crash, fix pump entity spam, fix NPE in rare corner cases in RobotRegistry unloading 2015-04-13 17:26:22 +02:00
asiekierka
931bc0523f Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-12 14:30:42 +02:00
asiekierka
c018abbb04 BuildCraft 6.4.11 2015-04-12 14:30:23 +02:00
asiekierka
605ef0fe28 fix up zone planner gui, add tablet improvements, merge, etc 2015-04-12 14:27:47 +02:00
asiekierka
ed5fd2b375 BuildCraft 6.4.10 2015-04-11 08:41:23 +02:00
asiekierka
b6ac3bb406 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-10 21:04:27 +02:00
asiekierka
bce4720a2b last-minute changelog update 2015-04-10 20:50:10 +02:00
asiekierka
b291458e4a BuildCraft 6.4.9 2015-04-10 20:43:42 +02:00
asiekierka
5de8bb327b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/core/recipes/FlexibleRecipe.java
2015-04-06 21:21:49 +02:00
asiekierka
180a020fc7 BuildCraft 6.4.8 2015-04-06 21:20:38 +02:00
asiekierka
24441a1ae5 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/pipes/PipeFluidsWood.java
2015-04-03 23:18:40 +02:00
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
d6f5063c42 begin work on ingame config 2015-04-02 14:46:57 +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
fa447318a4 add round-robin sorting to diamond pipes, fix #2372, fix minor lens bugs 2015-03-31 18:01:00 +02:00
asiekierka
cef844212d Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
2015-03-25 16:31:22 +01:00
asiekierka
5adaf78a02 BuildCraft 6.4.5 2015-03-25 15:42:26 +01:00
asiekierka
91194fc36d update changelog, texture 2015-03-25 15:34:00 +01:00
asiekierka
ce01c5773e allow placing machines on any side of a marker box 2015-03-24 17:29:27 +01:00
asiekierka
971f3614c9 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-22 12:59:35 +01:00
asiekierka
04fe3c31a7 BuildCraft 6.4.4 2015-03-22 00:34:34 +01:00
asiekierka
0a20b53c6d add RF power support to Auto Workbenches 2015-03-21 20:01:01 +01:00
asiekierka
bcb2a40fa5 make StatementParameterItemStacks override the description and output the item stack desc 2015-03-21 18:31:37 +01:00
asiekierka
ed76c9a4f1 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	common/buildcraft/BuildCraftTransport.java
2015-03-21 18:12:37 +01:00
asiekierka
69e9173a12 changes to robot accept/request behaviour 2015-03-21 18:11:22 +01:00
asiekierka
2186fbdd48 new features to stripes pipes 2015-03-21 11:20:07 +01:00
asiekierka
5cb7c9fe00 add stripes pipe direction control, add stripes handler priority system to API, add IBlueprintItem API thing 2015-03-20 17:03:46 +01:00
asiekierka
36ec39a59e improvements to Stripes Pipes 2015-03-20 15:07:12 +01:00
asiekierka
18add8b847 write global zone map system to replace earlier zone planner system 2015-03-19 22:01:52 +01:00
asiekierka
96492136c5 update 2015-03-17 08:24:14 +01:00
asiekierka
470dfc0049 raise packet sending frequency, sync lang 2015-03-15 17:23:08 +01:00
asiekierka
082cda0653 update Essence, fix wrenches and non-rotatables, add glowing laser rendering, add paintbrushes 2015-03-14 17:03:20 +01:00
asiekierka
5541c8e7fd BuildCraft 6.4.3 2015-03-10 08:11:23 +01:00
asiekierka
727c0e205b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-03-03 20:08:16 +01:00
asiekierka
883e8b479e fix changelog 2015-03-03 20:07:43 +01:00
asiekierka
dfa3f5f557 BuildCraft 6.4.2 2015-03-03 20:06:19 +01:00
asiekierka
d6dce9ee44 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft 2015-02-26 23:17:44 +01:00
asiekierka
9cd089bdc0 real BC 6.4.1, fix incorrect filler texture 2015-02-26 22:54:15 +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
2389f1e67b BuildCraft 6.3.7 2015-02-22 09:03:05 +01:00
asiekierka
20313b1e7f BuildCraft 6.3.6 - hotfix 2015-02-06 20:19:31 +01:00
asiekierka
86974d071e fix changelog 2015-02-06 19:56:20 +01:00
asiekierka
0dd57e7f27 BuildCraft 6.3.5 2015-02-06 19:39:24 +01:00