Commit graph

467 commits

Author SHA1 Message Date
Adrian
d0e5807c35 push resources, increase assembly table output size to 3x4, fix ledger icon blending bug 2015-05-06 20:03:45 +02:00
Adrian
1ac9cadca9 some refactoring, new Integration Table 2015-05-06 07:46:20 +02:00
asiekierka
f23ff7ac2e final BC 7.0.3 commit 2015-05-02 15:40:47 +02:00
asiekierka
4b9db3bdbb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-05-02 15:37:38 +02:00
asiekierka
00b0b97e3a BuildCraft 6.4.14 2015-04-28 20:27:18 +02:00
asiekierka
7c2a25b9be add some missing localizations (#2665) 2015-04-28 20:16:38 +02:00
asiekierka
eea3c12c3e add some missing localizations (#2665) 2015-04-28 18:50:14 +02:00
asiekierka
e749c6f36b implement #2672, add color-coding and percentage to robot charge 2015-04-27 17:04:42 +02:00
asiekierka
d8b302eee0 refactor: move all robot NBT classes into a single class 2015-04-27 16:53:28 +02:00
asiekierka
5cdedf9deb add #2627, FluidSpilledEvent; BC 7.0.2 2015-04-25 14:16:06 +02:00
asiekierka
e2033f5cea fix #2661, add changelog 2015-04-25 12:52:19 +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
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
9838582647 add new stamping crafting system with placeholder textures 2015-04-20 17:06:53 +02:00
asiekierka
8c77c24363 fix #2640, #2641, #2642; improve Zone Planner UI 2015-04-18 22:37:48 +02:00
asiekierka
d63d97a992 BuildCraft 7.0.1 Beta 2015-04-18 10:23:41 +02:00
asiekierka
ec15b0247a move quarry to Builders module, clean up a few things 2015-04-16 15:08:33 +02:00
asiekierka
32aafdb01d fix langfile 2015-04-15 15:45:10 +02:00
Hea3veN
b3ce32f26b cleanup docking station and robot statements 2015-04-14 22:46:34 -03: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
27b385d1d0 Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-09 18:48:45 +02:00
asiekierka
5a2dc4db3c add early tablet code, add facade non-laser recipe option, minor tweaks and refactors 2015-04-09 18:48:34 +02:00
Hea3veN
413cfc595d add a new Load/Unload area for robots 2015-04-08 20:47:03 -03: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
ad4d418f78 more zone plan changes 2015-04-05 10:39:42 +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
27beeb2542 forgot to push new robot API, push new zone planner GUI project 2015-04-03 13:34:25 +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
71c45e60ae add new Auto Workbench texture 2015-03-31 18:39:22 +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
493c261d9e finish laser table renders 2015-03-26 22:40:59 +01: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