SpaceToad
|
a29c0a1140
|
removed unused file
|
2014-05-10 13:43:30 +02:00 |
|
SpaceToad
|
98d2e2e2e6
|
Fixed issues with various schematics and their handling of item id translations.
The Schematic API has been updated to follow a pattern more explicit.
Part of #1745
|
2014-05-10 13:37:50 +02:00 |
|
Prototik
|
04859cce7d
|
Update MjAPI
|
2014-05-10 15:06:24 +08:00 |
|
SpaceToad
|
2738fbaef0
|
Merge branch 'Prototik-sided-mjbattery' into 6.0.x
|
2014-05-10 08:23:05 +02:00 |
|
SpaceToad
|
fb94d0f50c
|
Merge branch 'sided-mjbattery' of https://github.com/Prototik/BuildCraft into Prototik-sided-mjbattery
|
2014-05-10 08:21:31 +02:00 |
|
Prototik
|
cb3b3d1fce
|
Add support for sided batteries
|
2014-05-10 14:13:05 +08:00 |
|
SpaceToad
|
e18f01c784
|
Minor code reorganization to identify a unique block for legacy support.
|
2014-05-10 08:03:29 +02:00 |
|
SpaceToad
|
fba31fa057
|
Merge branch 'facades-5.0.x' of https://github.com/Prototik/BuildCraft into Prototik-facades-5.0.x
|
2014-05-10 07:59:09 +02:00 |
|
SpaceToad
|
684c695342
|
Merge pull request #1761 from Prototik/gate-and-ui
Fix partial state info glitches in AND gates
|
2014-05-10 07:41:46 +02:00 |
|
SpaceToad
|
178d82ef9f
|
added helper functions
|
2014-05-10 07:41:22 +02:00 |
|
Prototik
|
12d321491e
|
Add fallback facade loading for support migration from 5.0.x
|
2014-05-10 13:25:20 +08:00 |
|
SpaceToad
|
b2f8cf102d
|
started to work on fixing pipes ids, for #1745
|
2014-05-09 19:41:51 +02:00 |
|
SpaceToad
|
7c6c9f67f3
|
fixed lamp being replaced if lit status is different, close #1735
|
2014-05-09 19:09:58 +02:00 |
|
Prototik
|
d16e0153cf
|
Fix partial state info in AND gates
|
2014-05-10 01:04:14 +08:00 |
|
SpaceToad
|
4a0df69951
|
fixed style error
|
2014-05-09 18:19:50 +02:00 |
|
SpaceToad
|
25a99b2608
|
Merge branch '6.0.x' into 6.1.x
|
2014-05-09 18:19:00 +02:00 |
|
SpaceToad
|
515060fff3
|
Merge branch '6.0.x' into 6.1.x
|
2014-05-09 18:18:23 +02:00 |
|
SpaceToad
|
9ad662a6fa
|
Merge pull request #1760 from Prototik/blueprints-stack
Fix stacking of blueprints
|
2014-05-09 18:14:33 +02:00 |
|
SpaceToad
|
8f75c80618
|
added provision against NPE
|
2014-05-09 18:13:15 +02:00 |
|
SpaceToad
|
1febf3c714
|
updated energy framework to be openned to different channels, close #1756
|
2014-05-09 18:13:02 +02:00 |
|
Prototik
|
bff5a6b348
|
Fix stackable blueprints
|
2014-05-09 22:57:23 +08:00 |
|
SpaceToad
|
5c8bd331d3
|
Merge branch 'Prototik-ibatteryobject' into 6.0.x
|
2014-05-09 08:10:55 +02:00 |
|
SpaceToad
|
f299a7293b
|
extracted battery object to first-level class
|
2014-05-09 08:09:50 +02:00 |
|
Prototik
|
bed9b59b0e
|
Extract battery interface into IBatteryObject
|
2014-05-09 13:59:57 +08:00 |
|
SpaceToad
|
6ffd45f3d7
|
fixed style
|
2014-05-09 00:32:43 +02:00 |
|
SpaceToad
|
f91b9033fa
|
Whitelisted to Applied Energetics spacial API all blocks that don't rely on
absolute positions.
Close #1753
|
2014-05-08 21:57:05 +02:00 |
|
SpaceToad
|
53c84a0ba3
|
Merge branch 'Prototik-gate-and-ui' into 6.0.x
|
2014-05-08 18:26:21 +02:00 |
|
SpaceToad
|
cf52bdaa45
|
Merge branch 'gate-and-ui' of https://github.com/Prototik/BuildCraft into Prototik-gate-and-ui
|
2014-05-08 18:22:03 +02:00 |
|
SpaceToad
|
f344a4aed2
|
Merge pull request #1748 from tambry/architectshiftclickfix
Fix shift-clicking in architect table, fix #1740
|
2014-05-08 18:20:48 +02:00 |
|
SpaceToad
|
0eb0b01cbf
|
Merge pull request #1747 from Prototik/drop-blueprint
Drop blueprint if no space available in builder
|
2014-05-08 18:18:39 +02:00 |
|
Prototik
|
7ca9e6987d
|
Draw only half of indicator for AND gates when not all triggers active
|
2014-05-08 23:54:02 +08:00 |
|
Raul Tambre
|
27d095a00c
|
Fix shift-clicking in architect table, fix #1740
|
2014-05-08 17:50:31 +03:00 |
|
Prototik
|
1c17929fa5
|
Drop blueprint if no space available in builder
|
2014-05-08 22:26:41 +08:00 |
|
SpaceToad
|
7bb2808ff0
|
Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.0.x
|
2014-05-08 15:41:42 +02:00 |
|
SpaceToad
|
a70597a61a
|
Merge branch 'Prototik-mjapi' into 6.0.x
|
2014-05-08 15:41:05 +02:00 |
|
SpaceToad
|
f15419219d
|
Merge branch 'mjapi' of https://github.com/Prototik/BuildCraft into Prototik-mjapi
|
2014-05-08 15:40:41 +02:00 |
|
SpaceToad
|
8ca978b0e1
|
Merge pull request #1744 from Prototik/builder-comparator
Fix comparator requirements for builder
|
2014-05-08 15:36:52 +02:00 |
|
SpaceToad
|
915b9e2baf
|
Merge pull request #1743 from Prototik/builder-energy
Fix read/write nbt in builders
|
2014-05-08 15:35:42 +02:00 |
|
SpaceToad
|
7d9d6f8e8d
|
Merge branch 'Prototik-drop-stripes' into 6.0.x
|
2014-05-08 15:32:15 +02:00 |
|
SpaceToad
|
3fcebdd40f
|
Merge branch 'drop-stripes' of https://github.com/Prototik/BuildCraft into Prototik-drop-stripes
|
2014-05-08 15:30:54 +02:00 |
|
SpaceToad
|
6d4ac68dce
|
Merge branch 'tambry-blueprintlibrarypagebuttons' into 6.0.x
|
2014-05-08 15:30:01 +02:00 |
|
SpaceToad
|
c990c27ad2
|
only apply robot AI at next cycle
|
2014-05-08 15:28:23 +02:00 |
|
Prototik
|
31ac41aae6
|
Fix comparator requirements for builder
|
2014-05-08 20:25:33 +08:00 |
|
Prototik
|
246375c5ac
|
Update MjAPI (implementation and docs)
|
2014-05-08 19:11:54 +08:00 |
|
Prototik
|
fe2a5e6559
|
Fix read/write nbt in builders
|
2014-05-08 18:58:31 +08:00 |
|
Prototik
|
bfc6f02505
|
Fix server crash while drop items in stripes pipe too
|
2014-05-08 13:19:25 +08:00 |
|
Raul Tambre
|
2f7ae5a3f2
|
Disable/enable page buttons in blueprint library
|
2014-05-08 08:16:01 +03:00 |
|
SpaceToad
|
17b8a19eb1
|
removed deleted files
|
2014-05-08 00:28:27 +02:00 |
|
SpaceToad
|
0605b1d3f8
|
first attempts at using the regular AI framework, #1732
|
2014-05-08 00:27:46 +02:00 |
|
SpaceToad
|
771f42977c
|
Merge pull request #1736 from ninehous/patch-1
Update GuiBlueprintLibrary.java
|
2014-05-07 23:56:31 +02:00 |
|