Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
839 commits 8 branches 203 tags 97 MiB
Commit graph

669 commits

Author SHA1 Message Date
Blood-Asp
a50a5a1527 Fix paperboard recipes 2016-10-16 23:55:54 +02:00
Blood-Asp
52d40e14bc Fix recipes for forestry wood covers. 2016-10-16 20:41:49 +02:00
Blood-Asp
fa79dcd263 Base IC2 Classic compat. Reactor components disabled, some recipes likely missing/broken 2016-10-16 18:08:26 +02:00
Blood-Asp
f97698b054 Catch crash with Fossils Archeology Revival #642 2016-10-15 15:42:45 +02:00
Dimach
f037d652a7 Added forming press support for processing arrays. 2016-10-13 23:26:03 +02:00
Blood-Asp
c240b431f8 Fixed charcoal pile igniter bug 2016-10-13 22:48:08 +02:00
Blood-Asp
a006b76304 Drop Items from Exploding GT Machines + Config 2016-10-13 22:26:14 +02:00
Muramasa
ce632479bc Hide some unused blocks in NEI 2016-10-13 18:52:21 +01:00
Muramasa
e16b037cb7 Add config to enable all disabled mats & components. 2016-10-13 18:51:14 +01:00
Blood-Asp
021ed41721 Update Multiblock Tooltips 2016-10-13 17:46:05 +02:00
Muramasa
66ab344159 Fix VALUES & Replicator recipes 2016-10-13 16:43:06 +01:00
Blood-Asp
d4c23ed7a7 Show nuggets by default in NEI 2016-10-13 13:49:52 +02:00
Muramasa
796b822ab6 Add HasParentMod to config & Generate fluids for all Materials 2016-10-11 22:51:52 +01:00
Blood-Asp
1c8fcb89ec Fixing Heavy Duty Alloy Ingot recipes 2016-10-10 18:42:37 +02:00
Blood-Asp
bd3f76d12f Optimize hiding of fluid extraction recipes. 2016-10-10 18:10:32 +02:00
Muramasa
de9ade9d77 Fix TGreg & Remove unneeded config entries 2016-10-09 22:00:40 +01:00
Muramasa
88b78479c6 Fix Material.toString 2016-10-09 15:38:35 +01:00
Blood-Asp
3f92caf931 Fix Stone/Wood gear recipes 2016-10-09 16:34:41 +02:00
Blood-Asp
1b78b56388 Alloy energy hatch in every slice of the assembly line 2016-10-09 00:13:49 +02:00
Blood-Asp
64e495e32c Auto enable subitems when parser enables items. 2016-10-08 20:35:41 +02:00
Dimach
104bcf62d8 Fixed fluid regulator. 2016-10-08 20:17:03 +02:00
Blood-Asp
1a78a8dd51 ReaddAnnealed/Wrought config 2016-10-08 20:08:54 +02:00
Muramasa
79f0947172 Pull exp changes 2016-10-07 16:50:34 +01:00
Muramasa
b88e197530 Fix GT Crop extraction recipes & Seperate Comb&Crop nerf config option 2016-10-07 16:44:21 +01:00
Blood-Asp
c27399b512 Move load order for doors to fix malisis doors conflict. 2016-10-07 17:36:21 +02:00
Muramasa
2fb0ba6770 Fix nugget recipes 2016-10-07 13:50:38 +01:00
Blood-Asp
db7db8e4a0 Revert unwanted Heating Capacity behavior change. 2016-10-07 12:04:58 +02:00
Blood-Asp
6bcb607808 Sift only crushed ores that are gems 2016-10-07 01:13:26 +02:00
Blood-Asp
06c156a0c2 Return slabs on paper craft(this time without bug) 2016-10-07 01:12:46 +02:00
Blood-Asp
bdee358c0c Move ingot processing code to the right class. 2016-10-06 22:32:36 +02:00
Muramasa
d2efd7ae54 Small fixes 2016-10-04 04:32:51 +01:00
Muramasa
b457c53915 Update 2016-10-04 04:15:54 +01:00
Muramasa
173700a611 Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
Blood-Asp
d8dfffc01f Fix wires from ingots (again) 2016-10-04 00:25:55 +02:00
Muramasa
73f75357bc Add fluids without enabling the material 2016-10-03 10:40:36 +01:00
Blood-Asp
92294c1f88 MT script parser + metaitem reenabler do now work 2016-10-02 21:39:42 +02:00
Blood-Asp
811f2e971b quickfix reenabler 2016-10-02 19:16:20 +02:00
Blood-Asp
d3fc27c4dc Auto enable items found by MT script parser. Needs testing. 2016-10-02 19:12:55 +02:00
Blood-Asp
49843d2779 MT script parser 2016-10-02 17:58:28 +02:00
Dragon2488
13155cb4da 123 2016-10-02 11:15:33 +07:00
Dragon2488
d88748aa93 Legacy & New JEI capability 2016-10-01 11:20:56 +07:00
Muramasa
6564df167d Fix another dumb mistake 2016-10-01 03:53:10 +01:00
Muramasa
2f97e5e890 Fix another dumb mistake 2016-10-01 02:03:29 +01:00
Muramasa
b2c3113e05 Fix gem rod lathe recipes 2016-09-30 22:41:19 +01:00
Muramasa
2f1026cf31 Pull exp commit 2016-09-30 21:43:18 +01:00
Muramasa
999684f4d2 Exclusion fixes 2016-09-30 21:42:23 +01:00
Blood-Asp
e607bcc020 fix asteroid worldgen 2016-09-30 22:31:16 +02:00
Blood-Asp
928c07b439 Reenable GregTech Capes 2016-09-30 22:31:04 +02:00
Blood-Asp
aeae594e68 temporary disable returning of slabs on paper craft because of bug 2016-09-30 22:30:30 +02:00
Blood-Asp
4fd6c2ae72 Fix fusion reactor not using input fluids. 2016-09-30 22:30:16 +02:00
Blood-Asp
7079dccb8c Fix short distance teleport & readd null check on tools 2016-09-30 22:30:02 +02:00
Dragon2488
6bacb14144 Render Performance: 2 2016-09-30 23:20:15 +07:00
Blood-Asp
ab10a5d748 fix asteroid worldgen 2016-09-30 00:31:43 +02:00
Blood-Asp
d665022f4f Reenable GregTech Capes 2016-09-29 16:21:33 +02:00
Muramasa
c0f1fce859 Small fixes & Stop storage blocks and fluids for disabled materials 2016-09-29 07:36:45 +01:00
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
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
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
Dragon2488
461c02e69f ASM fixes. 2016-09-12 21:29:10 +07:00
Dragon2488
d9aa2535e6 JEI support, build.gradle update 2016-09-12 18:07:17 +07:00
Muramasa
75ef60a0c1 Add processing changes from LoadTimes/Bugfixes and more cleanup 2016-09-10 15:00:07 +01:00
Muramasa
33e6060119 Simplify, cleanup and seperate processors 2016-09-10 13:20:09 +01:00
Dragon2488
41276f206a Port: Part 4. Block rendering, machines, ASM, tools, items fixes & much more. 2016-09-09 21:51:35 +07:00
Muramasa
f53fb2b84b Bugfixes and now using built in OrePrefixes enabled/disabled lists 2016-09-09 14:25:59 +01:00
Dragon2488
b25e7eaf12 Port. Part 4: Fuck Mojangs. I can't make these fucking blocks have custom IBakedModel. It just doesn't work. Fuck mojangs. Project is frozen. Bye. 2016-09-06 16:53:20 +07:00
Daniel
735f76c649 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 12:18:17 +02:00
Daniel
b25332780a Update GT_MetaTileEntity_LargeTurbine_Steam.java 2016-09-03 12:16:06 +02:00
Daniel
90b1f5b910 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 12:15:34 +02:00
Daniel
568aca1804 Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 12:15:19 +02:00
Daniel
c52ff67fd6 Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 12:15:02 +02:00
Daniel
734a290302 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 12:09:49 +02:00
Daniel
0c3a42aa7d Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 11:56:53 +02:00
Daniel
9b3d7149cf Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 11:50:05 +02:00
Daniel
4c60c1e41e Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 11:49:18 +02:00
Daniel
408a07ef24 Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 11:42:53 +02:00
Blood-Asp
b4049e88a2 Port GT6 TC load time improvements 2016-08-31 14:22:00 +02:00
Muramasa
ac013d92c7 Actually, probably better to just exclude these 2016-08-31 04:57:16 +01:00
Muramasa
adca5141f9 fix issue with chest loot on server start 2016-08-31 04:47:54 +01:00
Muramasa
e1d777397f Fix lens recipes & duplicate config list entries 2016-08-31 03:58:43 +01:00
Muramasa
415e683a43 Configurable components & fixes 2016-08-31 02:22:51 +01:00
Blood-Asp
8086832d88 tmp fix for #595 2016-08-25 17:28:19 +02:00
Léa Gris
6401399e94 May or may not fix https://github.com/Blood-Asp/GT5-Unofficial/issues/565 
Possibly fix issue #565 Assembly line books: item names not shown correctly on server
Possibly not the right way but it should do.
 2016-08-23 23:05:50 +02:00
Muramasa
c66db54eab Fixes & work on #266 2016-08-23 16:39:20 +01:00
Muramasa-
ccfc536501 Merge pull request #603 from Muramasa-/Mats 
Material Rework
 2016-08-22 22:50:58 +01:00
Muramasa
5a94ea039b Some cleanup 2016-08-22 22:31:19 +01:00
Blood-Asp
49e5b53706 #573 Turbines now explode when producing more EU than dynamo can handle 2016-08-22 23:01:29 +02:00
Blood-Asp
9ff430c80d Fix #598 Delete saved recipe on machine change 2016-08-22 22:38:28 +02:00
Muramasa
5466ac4f52 Fixes #599 2016-08-22 20:25:13 +01:00
Muramasa
f8bd23f1b1 Fixes #561 2016-08-22 20:23:29 +01:00
Muramasa
afe222d2c1 Fixes #559 2016-08-22 20:21:53 +01:00
Muramasa
55133748f1 Fixes #561 2016-08-22 16:49:25 +01:00
Muramasa
29ebfa577c Fixes #599 2016-08-22 16:47:43 +01:00
Muramasa
a987228a6a Small fixes 2016-08-22 11:39:04 +01:00
Muramasa
0c4ec9a724 More compatibility fixes 2016-08-21 13:26:38 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
96b402648b Constructor fix 2016-08-19 13:19:16 +01:00
Muramasa
2c2105284c Whoops 2016-08-19 12:17:08 +01:00
Muramasa
46daf120bb initMaterialProperties 2016-08-19 12:15:05 +01:00
Dragon2488
91d9e24cd6 Port: Part 3. FINAL STEPS. And silent for next 11 days. 2016-08-18 20:45:27 +07:00
Muramasa
eaadf6f74b Config work 2016-08-18 07:00:57 +01:00
Muramasa
6917673264 Initial 
Fixed Materials limitation
Added ability to add Materials via a config
Added ability to change all properties of a Material via a config
 2016-08-17 06:09:55 +01:00
Muramasa
ccc7a18739 Bugfixes 10 2016-08-15 21:56:56 +01:00
Muramasa
0d9c100ade Const bool changes 2016-08-14 22:34:45 +01:00
Muramasa
0307f682b5 Bugfixes 9 2016-08-14 08:36:42 +01:00
Muramasa
5e5fa8cf38 Revert switch change 2016-08-14 08:12:25 +01:00
Muramasa
7874d1c91f Bugfixes 8 2016-08-14 08:06:00 +01:00
Muramasa
5eb2857389 Bugfixes 3/2/1 fix: Remove commented code 2016-08-14 07:40:20 +01:00
Muramasa
30b7a0d7e8 Bugfixes 4 fix: Remove commented code 2016-08-14 07:34:36 +01:00
Muramasa
1abb196a2f Bugfixes 5 fix: Removed commented code 2016-08-14 07:32:19 +01:00
Muramasa
25fe49f9c5 Bugfixes 6 fix: missed a file 2016-08-14 07:25:18 +01:00
Muramasa
f94313e9b1 Bugfixes 6 fix: Removed commented code 2016-08-14 07:24:57 +01:00
Muramasa
e85097319b Bugfixes 7 2016-08-14 07:19:03 +01:00
Muramasa
19062e1d36 Bugfixes 6 2016-08-14 05:56:41 +01:00
Muramasa
bfccecf87b Bugfixes 5 2016-08-14 05:36:12 +01:00
Muramasa
b6032a3bd2 Bugfixes 4 2016-08-14 05:09:34 +01:00
Muramasa
2bd06dc60e Bugfixes 3 2016-08-14 04:58:51 +01:00
Muramasa
8cdba03c0a Bugfixes 2 2016-08-14 03:50:59 +01:00
Muramasa
27917b29b3 More String var changes 2016-08-13 15:01:09 +01:00
Muramasa
c7ddde35e8 Small fix 2016-08-13 10:12:40 +01:00
Muramasa
009709462e TryCatch changes 2016-08-13 10:10:11 +01:00
Muramasa
0345ada52c Remove null checks 2016-08-13 09:10:38 +01:00
Muramasa
9ca24419fb HashMap > ConcurrentHashMap & String vars 2016-08-13 08:28:24 +01:00
Muramasa
27f2ee906a Rest of d2a098f 2016-08-13 07:23:34 +01:00
Muramasa
d2a098f80e PostInit reduction & Save registered recipes (No speed loss) 2016-08-13 07:18:32 +01:00
Muramasa
7d3615d74a For loop changes 2016-08-13 07:18:11 +01:00
Muramasa
ce1195d48c Worldgen and Random changes 2016-08-13 07:15:58 +01:00
Muramasa
349510f2da Bugfixes 1 2016-08-13 07:09:55 +01:00
Muramasa
4ee250357e GT_Block_Ores_GC Null check 2016-08-10 21:28:19 +01:00
Muramasa
1647387280 GC Ore Support 2016-08-10 21:14:53 +01:00
Dragon2488
6606382172 Port: Part 2. gregtech.common.blocks, gregtech.common.entities, gregtech.common.render 2016-08-11 02:43:37 +07:00
Blood-Asp
b3bd42ba8c Merge pull request #594 from Technus/experimental 
Paintable Wires
 2016-08-10 20:22:47 +02:00
Dragon2488
73a677f6bf Port: Part 1. gregtech.api, gregtech.common.covers, gregtech.common.render 2016-08-07 15:41:31 +07:00
Daniel
450bb19519 Paintable Wires 2016-08-07 08:39:14 +02:00
Muramasa
a1a65ef0f6 Use dim name for GC worlds. 2016-08-02 09:33:22 +01:00
Muramasa
ed89ccbc4f Remove asteroids from isGenerationAllowed 2016-08-01 15:08:11 +01:00
Muramasa
b5b8ea974f Bugs & Removal of GG's TileEntityOres 2016-07-29 20:13:02 +01:00
Muramasa
25209a4bcb Merge GG into GT 2016-07-29 18:54:45 +01:00
Blood-Asp
c8cca6390b Merge pull request #584 from OneEyeMaker/SmoothTransition 
More work on deprecated heating coils.
 2016-07-27 23:52:39 +02:00
Blood-Asp
c59f2e6611 Merge pull request #583 from Muramasa-/Fixes 
Remove UBC Dependency
 2016-07-27 23:51:41 +02:00
OneEyeMaker
be79f288a8 Added code for Pyrolyse Oven to smoothly replace deprecated coils. 2016-07-27 15:26:14 +03:00
OneEyeMaker
078a3bedde Added code for Oil Cracker to smoothly replace deprecated coils. 2016-07-27 14:59:56 +03:00
OneEyeMaker
848f84f35c Added code for Multi Smelter to smoothly replace deprecated coils. 2016-07-27 13:17:57 +03:00
OneEyeMaker
a8647b8929 Added code for Electric Blast Furnace to smoothly replace deprecated coils. 2016-07-27 13:02:12 +03:00
Muramasa
33f6c84be3 Use GameRegistry 2016-07-27 04:44:32 +01:00
Muramasa
a1a25d42dd Remove UBC Dependency 2016-07-27 04:21:53 +01:00
Blood-Asp
b4bcebf458 Handle fuel value as integer 2016-07-27 01:58:32 +02:00
Blood-Asp
a35cb1084f Merge pull request #569 from OneEyeMaker/NewFeatures 
New Heating coils.
 2016-07-27 01:52:15 +02:00
Draknyte1
dafe88d8e8 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 07:46:59 +10:00
OneEyeMaker
9c788fa292 Restored TextureSets 2016-07-26 20:02:41 +03:00
OneEyeMaker
eec5b2faa7 Fixed merge conflicts. 2016-07-26 09:02:10 +03:00
OneEyeMaker
9946e904b4 Merge branch 'experimental' into NewFeatures 2016-07-26 09:01:16 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
Blood-Asp
bd51aba156 Merge pull request #576 from Muramasa-/UBCSupport 
UBC Support / Ore System Restructure
 2016-07-26 00:56:21 +02:00
Muramasa
3bbd32136f Method simplification 
Simplified some methods.
Fixed incorrect honey requirement for scanning forestry species.
Tweaked a tooltips.
 2016-07-25 23:04:21 +01:00