Commit graph

2865 commits

Author SHA1 Message Date
Adrian Siekierka
87d33a710d energy triggers will now properly send the side to the RF energy container 2014-11-06 16:54:21 +01:00
Adrian Siekierka
b36d32f11a fix #2171 2014-11-06 16:39:06 +01:00
Adrian Siekierka
2507218e00 fix #2165 2014-11-06 16:00:05 +01:00
Adrian Siekierka
8daf2f695a Merge branch 'master' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-11-04 12:04:30 +01:00
Jakub Sztandera
1baec46c8a Fixed robots on MP. 2014-11-04 09:55:13 +01:00
asiekierka
af20777ce7 fix #2154 2014-11-03 17:04:14 +01:00
asiekierka
50a36b3aa9 fix #2143 2014-11-02 20:04:20 +01:00
asiekierka
4ea4bb9eae fix #2140 2014-11-02 08:48:13 +01:00
asiekierka
2c360318b3 fix style 2014-11-02 08:19:54 +01:00
asiekierka
6813d9882f touch-ups: fix lang typo, fix tooltip delay in zone planner 2014-11-02 08:12:22 +01:00
asiekierka
f17f0cc9d7 touchups: requester/zone planner recipes, tooltip/GUI improvements, adding missing langnames 2014-11-02 08:06:36 +01:00
asiekierka
388871fed4 un-un-un-restore 6.1.3 valve behaviour, use a hack to reset pipe state on valve action change 2014-11-02 07:46:55 +01:00
asiekierka
ad25b17c6e builders now only send packets to GUI watchers 2014-11-02 07:36:33 +01:00
asiekierka
98c5d71087 fix #2139, partial fix for builder not showing reqs 2014-11-02 07:10:02 +01:00
asiekierka
d0506b8a49 fix a lot of Builder bugginess 2014-11-01 22:25:29 +01:00
asiekierka
bf25fdfbf6 fix a bunch of Builder processing bugs 2014-11-01 17:55:08 +01:00
asiekierka
609c752790 add gate expansion recipe IMC 2014-11-01 15:17:04 +01:00
asiekierka
036efb7010 restore 6.1.3 valve behaviour 2014-11-01 13:04:01 +01:00
asiekierka
ce1daeecf1 make StatementParameters use NBT for serialization, add Blueprint Library debug code 2014-11-01 09:42:53 +01:00
asiekierka
da8d4513c4 add shift-click support to statement parameters, close #2107 (at last) 2014-11-01 09:03:50 +01:00
asiekierka
927f081c06 whoops, it did not compile 2014-11-01 08:15:31 +01:00
asiekierka
adaa9bf033 readd deprecated IMachine to fix OpenComputers crash 2014-11-01 08:13:41 +01:00
asiekierka
1562eee634 fix #2126 for gate expansions 2014-11-01 07:57:13 +01:00
asiekierka
fce0cfec44 fix #2136, rewrite statement icon code to remove StatementIconProvider 2014-11-01 07:47:52 +01:00
asiekierka
30f0b46f8b fix #2134 and #2135 2014-10-31 20:17:48 +01:00
asiekierka
ac962eb183 fix lasers emitting too many network packets 2014-10-31 18:50:32 +01:00
asiekierka
bf17bd43fd clean up Pipe/PipeTile APIs 2014-10-31 18:09:27 +01:00
asiekierka
c4b0c544cb Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-31 12:20:17 +01:00
Adrian Siekierka
5518ab7249 Merge pull request #2133 from Prototik/solid-coolant
Fix #2131
2014-10-31 13:18:14 +01:00
Prototik
895e05e3db Fix #2131 2014-10-31 18:22:05 +07:00
asiekierka
ed7bb595c7 reduce heavily the amount of objects created for schematics 2014-10-31 12:19:57 +01:00
asiekierka
885e7b0a1a massive optimizations to packet sending, close #2128 2014-10-31 07:34:28 +01:00
asiekierka
02bb70ec53 initialize mandatory parameters properly, fix bug with not removing certain unusable gate types when minParameters() is above 1 2014-10-30 20:06:02 +01:00
asiekierka
b997871f9a add proper handling of creative/survival blueprint outputs, close #2127 2014-10-30 19:57:35 +01:00
asiekierka
ea1e384253 fix statement parameter rotation, icon registration, directional statements, blueprint NPE, remove some stuff from heuristic block detection 2014-10-30 17:09:34 +01:00
asiekierka
85e588780f add debug messages for schematics and facades (close #2124), improve schematic autodetection 2014-10-30 12:47:55 +01:00
asiekierka
bf9bfc5c50 fix air checks in oil generation 2014-10-30 09:41:11 +01:00
asiekierka
11e8c06564 fix redstone input once and for all 2014-10-29 22:18:59 +01:00
asiekierka
0e6a4efddf fix more edge cases in redstone handling 2014-10-29 21:05:47 +01:00
asiekierka
10e789446b fix redstone behaviour in BuildCraft gates 2014-10-29 19:57:31 +01:00
asiekierka
792c40c49a Revert "fix redstone input direction going in the wrong direction"
This reverts commit 851d447837.
2014-10-29 19:16:14 +01:00
asiekierka
3c21b9c2e6 fix triggers not initializing statement parameters 2014-10-29 18:20:11 +01:00
asiekierka
ab2196507e fix a few bugs 2014-10-29 17:54:32 +01:00
asiekierka
ee76a283f1 fix #2116 2014-10-29 16:52:05 +01:00
asiekierka
eafa5fe859 minor tweaks throughout the source code 2014-10-29 16:18:21 +01:00
asiekierka
e146d1b46d fix style and BitSetUtils 2014-10-29 09:25:28 +01:00
asiekierka
57dc629b52 attempt to fix #2112, #2119 2014-10-29 06:33:00 +01:00
asiekierka
387f0f0a36 Fix ArrayIndexOutOfBoundsException and parameters in Diamond gates 2014-10-28 22:37:56 +01:00
asiekierka
851d447837 fix redstone input direction going in the wrong direction 2014-10-28 21:59:02 +01:00
asiekierka
a3d17c72aa fix GateLogicSwap always reverting to basic gates 2014-10-28 21:41:54 +01:00
asiekierka
239edfa78a add null checks for obsidian pipes, fix #2111 2014-10-28 20:19:01 +01:00
asiekierka
9c31b0123b add early draft of Tiles API, remove IMachine 2014-10-28 20:15:30 +01:00
asiekierka
8b57b75edc fix trigger crash bugs for #2107 2014-10-28 17:27:20 +01:00
asiekierka
4492802f25 Further work on refactoring the Gate API for #2107 2014-10-28 17:21:45 +01:00
asiekierka
8728885c2c further work on improving/separating the gate API, #2107 2014-10-28 12:17:52 +01:00
asiekierka
489a3cc6f7 move StatementManager parameter handling to use getUniqueTag, for #2107 2014-10-28 07:22:43 +01:00
asiekierka
56dd1a6bdd refactor and add functionality to gate API, for #2107 2014-10-28 06:56:49 +01:00
asiekierka
a5758d1bf1 various fixes 2014-10-27 12:16:30 +01:00
asiekierka
1e007896e0 fix #2105 2014-10-27 08:59:49 +01:00
asiekierka
6e8b6488ab fix checkStyle 2014-10-26 19:09:54 +01:00
asiekierka
7af1f9ed05 fix #2102 2014-10-26 19:08:56 +01:00
asiekierka
f190377014 add gatesideonly icon, make Redstone Output use localizations, update en_US.lang 2014-10-26 17:58:59 +01:00
asiekierka
9ddcb5cce4 added mouse button and description to statement parameters, added sided redstone I/O support 2014-10-26 17:56:18 +01:00
asiekierka
c1c475fc65 add pipe coloring/washing recipe, fix gate/docking station/etc. drops 2014-10-26 16:32:13 +01:00
asiekierka
0fd4ade49d add custom ore support to miners and fix flying robots upon being hit 2014-10-26 14:54:23 +01:00
asiekierka
5d7b5109d3 whoops, was supposed to undo this refactor 2014-10-26 13:22:57 +01:00
asiekierka
626709a806 triggers -> statements 2014-10-26 13:20:08 +01:00
asiekierka
5fde18014b fix style 2014-10-26 12:42:11 +01:00
asiekierka
24b4859178 use the API breaking changes as an occasion to make Schematic function names make more sense 2014-10-26 12:34:07 +01:00
asiekierka
53cfda589e refactor SchematicRegistry to ISchematicRegistry 2014-10-26 12:27:51 +01:00
asiekierka
3eae592b59 refactor SchematicRegistry to use BlockMetaPairs, add fluid and block heuristics 2014-10-26 11:43:54 +01:00
asiekierka
95f13ba439 remove modsSupported, redundant Architect Table options, etc... strive for a proper builder supporting system 2014-10-26 10:30:34 +01:00
asiekierka
e68b197e7e fix checkStyle 2014-10-26 09:43:39 +01:00
asiekierka
7a542e2102 try to fix #1995 2014-10-26 09:40:16 +01:00
asiekierka
0fe11813e8 make gate copiers use raytracing and not naive sides, add textures and recipes 2014-10-26 08:57:49 +01:00
asiekierka
fd370955bd add gate verification post-copy, fix minor update bug 2014-10-26 07:32:12 +01:00
asiekierka
59686cd481 add gate copiers, close #2081 2014-10-25 22:22:25 +02:00
asiekierka
64c263c1cb fix checkStyle, make color tooltips localized 2014-10-25 19:59:10 +02:00
asiekierka
9427f00c8f fix minor rendering bug, add tooltips 2014-10-25 18:36:56 +02:00
asiekierka
92c8747dda Revert "fix #2092"
This reverts commit e562b6f737.
2014-10-25 18:20:51 +02:00
asiekierka
ee92dd822c add stained glass pipes 2014-10-25 17:34:45 +02:00
asiekierka
d02b0dc066 restore the old redstone i/o behaviour in core/triggers as well 2014-10-25 12:07:18 +02:00
asiekierka
210900a8f8 temporaily restore old redstone i/o behaviour 2014-10-25 12:06:48 +02:00
asiekierka
999b045b13 optimize NBT usage and some other oddities 2014-10-25 11:58:25 +02:00
asiekierka
13fddf9b87 add an escape route for cases where a gate is on all sides of a pipe 2014-10-25 11:41:58 +02:00
asiekierka
59350f8677 fix #2095 2014-10-25 11:40:34 +02:00
asiekierka
e562b6f737 fix #2092 2014-10-25 08:48:27 +02:00
asiekierka
4839a666c1 fix #2093 2014-10-25 08:46:52 +02:00
asiekierka
60e0e17980 add workaround for #2090 2014-10-24 23:22:10 +02:00
asiekierka
fd6a456434 add buildcraft quarry frame cleanup, close #2005 2014-10-24 20:11:05 +02:00
asiekierka
7f0f16ef62 fix docking station crash in negative-numbered dimensions 2014-10-24 16:57:33 +02:00
asiekierka
4ac490a581 fix style 2014-10-24 16:34:15 +02:00
asiekierka
030191d7cd redstone output is now sided for gates, close #2085 2014-10-24 16:22:32 +02:00
asiekierka
482e1d575c redstone input is now sided for gates, for #2085 2014-10-24 16:18:28 +02:00
asiekierka
686d7113d2 fix facade cycling, add support for chiseled quartz and pillars 2014-10-24 15:53:49 +02:00
asiekierka
44a0b1bf6f restore 6.1.2 valve behaviour after getting feedback 2014-10-24 15:18:22 +02:00
asiekierka
6085945d9a remove science book/technology code, close #2088 2014-10-24 10:32:10 +02:00
asiekierka
95427776d4 fix #2083 and redstoneInputSide bug 2014-10-23 15:47:28 +02:00
asiekierka
25aedffac3 update to 6.1.3, fix #2082 2014-10-23 14:48:02 +02:00
asiekierka
645deeb3ea Add extra getters to FlexibleRecipe for #2078 2014-10-22 19:11:54 +02:00
asiekierka
95c85ae535 fix #1599 2014-10-22 17:47:08 +02:00
asiekierka
3c24d1ecf4 hook up the bucket stripes pipe handler to the Forge fluid API 2014-10-22 16:58:01 +02:00
asiekierka
3323779c74 further stripes pipe refactor, improve API, close #1670 2014-10-22 16:44:46 +02:00
asiekierka
42f6d298ee refactor stripes pipes, create early version of stripes pipe API, for #1670 2014-10-22 16:30:53 +02:00
asiekierka
559387ba38 fix checkStyle 2014-10-22 11:13:33 +02:00
asiekierka
dcb138bba3 rewrite redstone engines, certain pipes among others; start work on #2075 2014-10-22 11:04:12 +02:00
asiekierka
8e025fede5 logging should have been using BCLog, not Logger; run automated cleanup on source code 2014-10-22 06:30:05 +02:00
asiekierka
5a4635876c improve engine mechanics and fix orientation bugs 2014-10-22 06:25:18 +02:00
Adrian Siekierka
582ebb9887 Merge pull request #2072 from adudney/LightOptimizations
Optimized power transport pipes a bit
2014-10-22 06:20:11 +02:00
Andrew Dudney
55ae375dd2 Changed Math.min call to outside the loop so as to split power evenly between inputs when more energy is requested than can be output 2014-10-21 16:34:00 -06:00
Andrew Dudney
5923e2333c Optimized power transport pipes a bit 2014-10-21 16:26:46 -06:00
asiekierka
7bc31deb52 add further invalid IMC checks and logging for #2071 2014-10-21 16:26:14 +02:00
asiekierka
f30b370870 fix #2071 2014-10-21 12:04:45 +02:00
asiekierka
007390617c use IEnergyConnection instead of IEnergyHandler 2014-10-21 10:48:45 +02:00
Adrian Siekierka
6755db397b Merge pull request #2070 from adudney/NameRemappingMark2
Fixed Laser remapping (again) and gave buildToolBlock a name
2014-10-21 09:03:15 +02:00
Andrew Dudney
9e291e9bd3 Check style 2014-10-20 18:14:54 -06:00
Andrew Dudney
997a2eb98e Fixed Laser remapping (again) and added buildToolBlock name so that there are no more null names (That's the thing that the builder/filler uses to show the red flying breaker block) 2014-10-20 18:06:57 -06:00
Andrew Dudney
dabb9946e1 Stopped wooden pipes from extracting from IEnergySources, it seems to be unnecessary 2014-10-20 15:59:05 -06:00
asiekierka
0b4ec5b84b optimize chutes further 2014-10-20 16:23:12 +02:00
asiekierka
b9657e8bbc optimize quarry and chute tile entity lookups 2014-10-20 16:16:18 +02:00
asiekierka
10b224b21c fix style 2014-10-20 12:38:26 +02:00
asiekierka
e4bf8981d7 minor fixes, including valve behaviour changes to make more sense 2014-10-20 10:41:50 +02:00
Andrew Dudney
72df99713b Fixed laser remapping 2014-10-19 16:09:49 -06:00
asiekierka
b512beb449 fix style 2014-10-19 21:53:19 +02:00
asiekierka
2374bd1526 fix #1901 and #2061 2014-10-19 21:04:02 +02:00
asiekierka
061a07192e fix silicon laser table remapping 2014-10-19 19:53:45 +02:00
asiekierka
ec846a4e46 fix #2062 2014-10-19 19:48:13 +02:00
asiekierka
554ac2a636 clean up buildcraft.energy, for #2045 2014-10-19 14:42:58 +02:00
asiekierka
32a9d625d8 Finish cleaning up Silicon and Transport, for #2045 2014-10-19 14:36:27 +02:00
asiekierka
260a57d600 create IFacadeItem API, close #1946 2014-10-19 12:21:45 +02:00
asiekierka
88351a6bd8 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-19 11:00:11 +02:00
asiekierka
3706cc3148 fix #2043 2014-10-19 11:00:01 +02:00
Adrian Siekierka
5df3d14370 Merge pull request #2059 from AEnterprise/6.1.x
fix laserTables being mapped as "null" and remap them
2014-10-19 10:25:00 +02:00
AEnterprise
eac078658c fix style 2014-10-19 10:24:27 +02:00
asiekierka
9686830173 fix style 2014-10-19 10:20:17 +02:00
AEnterprise
ba8608f7aa fix laserTables being mapped as "null" and remap them 2014-10-19 10:18:23 +02:00
asiekierka
5f5b95dd9a fix #2056 2014-10-19 08:12:25 +02:00
Adrian Siekierka
0e8b64ab76 Merge pull request #2052 from adudney/6.1.x
Fixes engines storing energy for all time when unpowered
2014-10-19 08:02:43 +02:00
Adrian Siekierka
12e2cb0574 Merge pull request #2054 from adudney/RedstoneEngine
Fixed redstone engines being 1/10th as effective as they should be
2014-10-19 08:02:07 +02:00
Andrew Dudney
652b28d57a Fixed engines not switching to continuous power if the orientation they were in was valid to begin with 2014-10-18 21:32:52 -06:00
Andrew Dudney
35d1def0b2 Fixed Wooden Item Pipe extracing items for 1/10th the energy it should use. 2014-10-18 20:44:47 -06:00
Andrew Dudney
b5c2129706 Fixed redstone engines being 1/10th as effective as they should be 2014-10-18 20:38:41 -06:00
Andrew Dudney
59f0b5e412 Added call to super.updateEngine in the combustion tile, disabled generation of energy when redstone is off for the stirling tile. 2014-10-18 17:18:07 -06:00
asiekierka
4c4f679f55 remove useless TileEngineLegacy class 2014-10-19 00:08:39 +02:00
asiekierka
593a5a5c07 remove redundant code from #2051 2014-10-18 23:49:08 +02:00
Andrew Dudney
d691d72bcc Fixed stone engine heat mechanics 2014-10-18 14:05:14 -06:00
asiekierka
32f7dbe0dc Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-18 19:16:36 +02:00
asiekierka
c961de9daf fix a lot of engine code, close #2048 2014-10-18 19:16:22 +02:00
Adrian Siekierka
b3eeef39e3 Merge pull request #1992 from kremkrem/6.1.x
fixed door schematic saving, for #1962
2014-10-18 16:32:12 +02:00
asiekierka
777fee2092 fix style 2014-10-18 16:23:47 +02:00
asiekierka
e5904e0316 BuildCraft 6.1.2 2014-10-18 15:45:43 +02:00
asiekierka
57e8829266 further work on #2045 2014-10-18 15:26:23 +02:00
asiekierka
24a02a5b17 begin moving things between Core and Builders for #2045 - Factory should now only depend on Core 2014-10-18 14:20:06 +02:00
asiekierka
257c49f4f9 fix valves for power and add omnidirectional valves with no parameter, closes #2019 2014-10-18 09:44:04 +02:00
asiekierka
3c41186609 make BuildCraft log warnings more consistent and improve their spelling quality 2014-10-18 09:14:54 +02:00
asiekierka
b3e908d1ac cleanup, add recipe removal APIs and IMC messages 2014-10-18 09:11:08 +02:00
asiekierka
c04224d466 add BuildCraftCompat hooks 2014-10-16 10:41:55 +02:00
asiekierka
b5710e826e fix style 2014-10-15 18:49:17 +02:00
asiekierka
549cbd5219 clean up engine and fuel code to fully use RF 2014-10-15 18:45:16 +02:00
asiekierka
06ab6e09c6 fix ILaserTarget deprecation and add ILaserTargetBlock as a major optimization for laser lookups, closes #2027 2014-10-15 18:20:37 +02:00
asiekierka
249caf7e21 fix wooden kinesis pipes not taking energy from certain RF generators unless they already had energy in them 2014-10-15 18:13:21 +02:00
asiekierka
0db1a4cbe3 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-15 17:44:12 +02:00
asiekierka
455436c87c fix #2034 2014-10-15 17:43:28 +02:00
Adrian Siekierka
47fa82e169 Merge pull request #2032 from marcin212/patch-1
fixed NPE in WorldProperty
2014-10-15 17:40:24 +02:00
asiekierka
f49b04da37 Fix facade recipe desynchronization on client and server. Closes #2042
This bug was caused by tterrag's pull request having a hasNoNullIcons
function, which returned false on the server side, not letting any
facade recipe through. The new approach relies on replacing non-existant
textures with a transparent oeeN
2014-10-15 15:51:57 +02:00
asiekierka
3f752cca4b Merge branch '6.0.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-10-15 15:41:19 +02:00
Tyson Brown
a698f56719 Fixed incorrect chunk positions in SpringPopulate and OilPopulate. 2014-10-08 13:15:36 -04:00
marcin212
b819ad4c3f fixed NPE in WorldProperty
probably fix: https://gist.github.com/marcin212/8e73b41a6269f0825d03
2014-10-01 15:44:34 +02:00
AEnterprise
84c6b57ae5 fix robot event 2014-09-20 11:52:18 +02:00
AEnterprise
8d6dc8c29b fix merge conflict 2014-09-20 11:46:31 +02:00
SpaceToad
51075b886c Merge pull request #2024 from AEnterprise/6.1.x
add event to detect and prevent the placement of robots
2014-09-20 10:40:00 +01:00
AEnterprise
6ee4b2de2e fix style and coppyright notices 2014-09-20 11:30:33 +02:00
ShetiPhian
1dfd5479e5 Set toolClass of ItemWrench to "wrench"
Allows other mods to use the BuildCraft wrench (for things other then rotation) without needing to know the itemstack or implementing the API.
2014-09-19 22:20:23 -04:00
AEnterprise
daff831569 make markers and builder send BC block placement events 2014-09-19 16:05:02 +02:00
AEnterprise
9330dd18d9 also need coordinates for the pipe placement location 2014-09-18 17:25:28 +02:00
AEnterprise
fb706ae1ab detect interaction with pipes (for gates, plugs and robot stations) 2014-09-17 18:13:00 +02:00
AEnterprise
b01533e1d5 make it possible to differenciate between the lasertables and engines 2014-09-17 15:41:45 +02:00
AEnterprise
cdc7ea054b filtered buffer wasn't sending blockInteraction event 2014-09-17 13:41:27 +02:00
AEnterprise
21a5f00199 somehow the old import didn't get removed 2014-09-16 21:32:41 +02:00
AEnterprise
d3d6f88a1c make refinery extend BlockBuildcraft 2014-09-16 21:20:42 +02:00
AEnterprise
78091876ad fix mining well not calling super when placed down 2014-09-16 21:07:37 +02:00
AEnterprise
e28a74b771 make blockTank extend BlockBuildcraft 2014-09-16 20:35:05 +02:00
AEnterprise
0c11181e85 add event to detect and prevent the placement of robots 2014-09-16 17:39:18 +02:00
SpaceToad
857b0c42ca Merge pull request #2022 from ChatFawkes/patch-1
Change tooltips to use RF instead of MJ
2014-09-15 18:25:03 +01:00
SpaceToad
97f1b11ce1 Merge pull request #2023 from AEnterprise/6.1.x
fix game crashing when placing robot without a redstone board installed
2014-09-15 18:21:43 +01:00
AEnterprise
df1cf3c6d1 fix style (again) 2014-09-15 08:44:45 +02:00
AEnterprise
e78fc8a778 fix game crashing when placing robot without a redstone board installed 2014-09-15 08:33:45 +02:00
ChatFawkes
4af697a5e6 Change tooltips to use RF instead of MJ 2014-09-15 00:59:00 -04:00
SpaceToad
446bf4454b fixed quarry pumping out frames, close #1941 2014-09-15 00:44:57 +02:00
SpaceToad
1d9dcd6ae2 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-09-14 20:53:06 +02:00
SpaceToad
1ec9d92699 added variable timeout for schematic, down to 1. close #1971 2014-09-14 20:52:53 +02:00
SpaceToad
9fc636d272 Merge pull request #2020 from AEnterprise/6.1.x
fix progressbar in the lasertables
2014-09-14 16:46:35 +01:00
AEnterprise
dec9be8f51 fix progressbar in the lasertables 2014-09-14 17:44:15 +02:00
SpaceToad
2c5c282f2f fixed potential integer overflow 2014-09-14 17:30:45 +02:00
SpaceToad
3d3085dd06 fixed precision loss in average computation, close #2016 2014-09-14 17:28:14 +02:00
SpaceToad
69ff44dc9f Fixed wood pipe accepting energy from other pipes, following RF migration.
Part of #2016.
2014-09-14 16:59:07 +02:00
SpaceToad
2e76b90191 Merge pull request #2018 from AEnterprise/6.1.x
fix MJ->RF migration with blocks that where already in the world
2014-09-14 15:25:34 +01:00
AEnterprise
aab946140b fix style, remove unnecesairy check 2014-09-14 16:18:57 +02:00
AEnterprise
5e526416c4 fix MJ->RF migration with blocks that where already in the world 2014-09-14 15:58:37 +02:00
SpaceToad
fca62af54b fixed style 2014-09-14 15:44:38 +02:00