Commit graph

860 commits

Author SHA1 Message Date
Muramasa
c283f7fe36 Temp fix for missing Greg'd recipes 2016-09-29 03:42:44 +01:00
Dragon2488
0dcfc8e5f0 Render Lags fix 2016-09-29 07:06:37 +07:00
Blood-Asp
7e1bc813d2 temporary disable returning of slabs on paper craft because of bug 2016-09-28 20:42:41 +02:00
Blood-Asp
18e8ee1ad3 Fix fusion reactor not using input fluids. 2016-09-28 19:55:31 +02:00
Blood-Asp
7b8573d32e Fix short distance teleport & readd null check on tools 2016-09-28 14:05:10 +02:00
Blood-Asp
1e7a044fe0 Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:23:42 +02:00
Muramasa
16a3c059b3 Fix pollution onWorldTick server crash 2016-09-28 13:23:21 +02:00
Muramasa-
0570c23ea6 Fixes harvest crash 2016-09-28 13:22:46 +02:00
Blood-Asp
51e1704e5e Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:05:02 +02:00
Muramasa
7b7e0d8a78 Fix pollution onWorldTick server crash 2016-09-28 08:07:07 +01:00
Muramasa-
0ada20e86f Fixes harvest crash 2016-09-28 05:45:30 +01:00
Muramasa
5fbfa73be9 Update, bump version and Most of TGreg compat fixes 2016-09-27 23:39:42 +01:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02:00
Muramasa
919a75686d Upadate with exp changes 2016-09-27 17:29:51 +01:00
Blood-Asp
a6216b8cf0 Count pipe transfers on input not output side 2016-09-27 18:11:19 +02:00
Blood-Asp
7074a513ab Pollution configs and first effects 2016-09-27 16:35:03 +02:00
Blood-Asp
16fb901529 More Pollution & bugfixes 2016-09-27 02:00:19 +02:00
Muramasa-
97d7efcc22 Possible fix for scanner TE error 2016-09-26 14:03:20 +01:00
Muramasa
3ee18ca555 Cleanup, disable auto TE recipes with config and fixes 2016-09-25 00:25:15 +01:00
Muramasa
fed8109b17 Update with exp changes 2016-09-24 23:05:18 +01:00
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02:00
Blood-Asp
6217cca671 Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:42:42 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01:00
Dragon2488
457fb3a4ad Oregen sync fix 2016-09-23 17:14:43 +07:00
Muramasa
291839871e Reduce disabled component creation & GT_Proxy postInit -> Processors 2016-09-23 02:28:29 +01:00
Dragon2488
5509d94044 oregen lag fix 2016-09-22 22:00:27 +07:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
2016-09-20 17:03:18 +01:00
Dragon2488
dda2aa95a2 Bump GT version, temporary oregen lag fix. 2016-09-18 14:56:20 +07:00
Dragon2488
82dab9d1bd JEI recipes overlapping fix. 2016-09-18 13:04:39 +07:00
Dragon2488
d94f16ea07 Pipes and cables rendering 2016-09-18 00:02:46 +07: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
23546a5c2c Stop disabled component recipe gen, more separation and fixes 2016-09-16 15:01:37 +01:00
Muramasa
312141cd10 Fix it again 2016-09-16 12:17:19 +01:00
Muramasa
491925bc59 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-16 12:06:01 +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
Dragon2488
a5d2eaffa3 Oops (x2) 2016-09-16 00:39:19 +07:00
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +01:00
Muramasa
b10acf8244 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-15 15:40:06 +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
Dragon2488
0080b1a69b Fixed run on dedicated server. 2016-09-15 21:24:35 +07:00
Dragon2488
d490759e8d Lightning fix, black blocks on break attempt fix 2016-09-15 18:28:52 +07: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
Dragon2488
7f1791abbf Lightning fix, black blocks on break attempt fix 2016-09-13 17:15:07 +07:00
Blood-Asp
4091b39401 Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-09-13 00:29:46 +02:00
Blood-Asp
a7c0bd518b Gave away new bock ids. 2016-09-13 00:29:43 +02:00
Dragon2488
235b6310f8 Rewrite gregtech.asm to clean ASM and removed javassist 2016-09-12 22:27:35 +07:00