Commit graph

563 commits

Author SHA1 Message Date
Muramasa
789199a578 Concurrent Hash maps and string vars 2016-09-22 19:10:30 +02:00
Muramasa
c6bc630efc Rest of previous commit 2016-09-22 18:46:07 +02:00
Muramasa
436389d3f1 For Loop Changes 2016-09-22 18:40:19 +02:00
Muramasa
ae471ca1a8 Worldgen and random changes 2016-09-22 18:35:20 +02:00
Technus
676e4c4e91 Made the onFirstTick methods use argument instead 2016-09-22 18:16:31 +02:00
Technus
bd924faa07 Finally working on first ticks on the teleporter and microwaveET's.
Also minor spelling fix
2016-09-22 17:50:53 +02:00
Technus
b374cf7a70 Tweaks 2016-09-21 22:22:41 +02:00
Technus
9847f73d98 Work on tiers 2016-09-21 22:22:12 +02:00
Technus
93da2917ed Scanner spacebars O: 2016-09-21 22:21:31 +02:00
Technus
5891c4cb36 Last bit of work on scanner 2016-09-21 22:16:54 +02:00
Technus
2242c65161 Scanner initial change 2016-09-21 22:14:27 +02:00
Technus
13f4435a02 Minor changes - fixed derp in string generation 2016-09-21 22:09:51 +02:00
Technus
e9db0f877f Fix Proc even more! 2016-09-21 22:07:55 +02:00
Technus
366a90fd1f more work on ultimat-er battery 2016-09-21 22:07:28 +02:00
Technus
9da4080fea no message 2016-09-21 22:07:21 +02:00
Technus
7dfb3e0da9 Adjusting multiblocks for bettter tiering 2016-09-21 22:05:58 +02:00
Technus
81dc8a48b1 no message 2016-09-21 22:03:09 +02:00
Technus
66f7ef1cc0 EVEN MORE WORK^2 2016-09-21 22:03:00 +02:00
Technus
d09a81b501 EVEN MORE WORK 2016-09-21 22:02:51 +02:00
Technus
fcae1a1801 Materials update, whitespaces, Higher tier method adjustment for long computaion. 2016-09-21 22:02:16 +02:00
Daniel
9543983754 Update GT_RecipeAdder.java 2016-09-21 21:36:23 +02:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
2016-09-20 17:03:18 +01:00
Muramasa
a03fc7fc1d That didn't work 2016-09-17 13:27:03 +01:00
Muramasa
769362d60b Reduce Marble/Basalt harvest level and setOreBlock fixes 2016-09-16 15:42:27 +01:00
Muramasa
312141cd10 Fix it again 2016-09-16 12:17:19 +01:00
Muramasa
e981c0db30 One more conflict 2016-09-16 00:27:47 +01:00
Muramasa
6ac01a92c9 Fix conflicts 2016-09-16 00:17:08 +01:00
Blood-Asp
0e60389c41 Fix Tools and lag on reading tooltip 2016-09-15 22:02:18 +02:00
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +01:00
Blood-Asp
c997df5952 Add Magneticraft compat
and remove Thaumcraft changes because of bugs/no improvements
And add config to arc smelt not annealed/wought.
2016-09-15 16:36:08 +02:00
Muramasa
1c195f5aab Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes 2016-09-13 23:40:50 +01:00
Muramasa-
059cf34455 Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
2016-09-13 21:09:38 +01:00
Technus
5e5ae2fb72 Scanner 2016-09-08 09:39:42 +02:00
Technus
4430c5b712 Scanner spacebars O: 2016-09-08 09:26:35 +02:00
Technus
86f5439e1a Scanner work 2016-09-08 09:03:44 +02:00
Technus
b7ceab4a53 Scanner 2 2016-09-07 19:47:16 +02:00
Technus
6198b220ee Scanner 1 2016-09-07 19:43:12 +02:00
Technus
5cc999c3f2 Revert "Update GT_RecipeAdder.java"
This reverts commit 4c4c26043f.
2016-09-04 23:27:27 +02:00
Daniel
4c4c26043f Update GT_RecipeAdder.java 2016-09-04 23:24:03 +02:00
Daniel
f0c73eda1f Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 13:19:18 +02:00
Daniel
eedfe0892e Update GT_MetaTileEntity_LargeTurbine_Steam.java 2016-09-03 13:19:08 +02:00
Daniel
ced02dc186 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 13:18:56 +02:00
Daniel
05911e2fbd Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 13:18:37 +02:00
Daniel
6d536a232a Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 13:18:25 +02:00
Daniel
7dc2fac9d5 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 13:18:10 +02:00
Daniel
44a5f3f305 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 13:17:52 +02:00
Daniel
1de6b9c23a Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 13:17:02 +02:00
Daniel
8e7e866990 Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 13:16:23 +02:00
Daniel
7e98a61fa2 Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 13:15:05 +02:00
Daniel
735f76c649 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 12:18:17 +02:00