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

1038 commits

Author SHA1 Message Date
Muramasa-
601264e4bf Possible fix for scanner TE error 2016-10-02 12:33:29 +02:00
Dream-Master
32fdda2a18 Rods out of Sticks works again 2016-10-02 11:38:18 +02:00
Dream-Master
8ee5705fb2 Revert "Try this to fix Lathe recipes" 
This reverts commit 2bb5630194.
 2016-10-02 10:54:07 +02:00
Dream-Master
e6c25e86ea Revert "Try this to fix Lathe recipes" 
This reverts commit 26300789bb.
 2016-10-02 10:53:35 +02:00
Dream-Master
26300789bb Try this to fix Lathe recipes 2016-10-02 02:22:12 +02:00
Dream-Master
2bb5630194 Try this to fix Lathe recipes 2016-10-01 23:38:44 +02:00
Dream-Master
b2d63bf110 line fixes 2016-10-01 21:44:50 +02:00
Muramasa
372e5193ba 2f97e5e890 2016-10-01 21:01:00 +02:00
Technus
c3c85319c0 Fixes #714 - solar boiler 2016-10-01 12:06:43 +02:00
Muramasa
2f97e5e890 Fix another dumb mistake 2016-10-01 02:03:29 +01:00
Blood-Asp
761494de6f temporary disable returning of slabs on paper craft because of bug 2016-10-01 00:19:25 +02: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
Dream-Master
d16dc2a23c revert Teleporter code 2016-09-29 10:45:39 +02:00
Dream-Master
9946e218df revert some stuff 2016-09-29 10:44:12 +02:00
Muramasa-
5eef2209fb Possible fix for scanner TE error(Blood Asp) 2016-09-29 10:37:16 +02:00
Blood-Asp
1972ee4076 Count pipe transfers on input not output side 2016-09-29 10:33:31 +02:00
Muramasa-
1806dd0758 fix interdimensional teleport(Blood asp) 2016-09-29 10:32:00 +02:00
Muramasa
4659eb185e Temp fix for missing Greg'd recipes (Muramasa) 2016-09-29 10:21:39 +02:00
Muramasa
c283f7fe36 Temp fix for missing Greg'd recipes 2016-09-29 03:42:44 +01:00
Dream-Master
829c7911aa changes Disel gen text 2016-09-28 23:34:13 +02:00
Dream-Master
d61b120ce4 Adding UBC Support from Blood asps code 2016-09-28 23:31:49 +02:00
Dream-Master
aad7dba1e5 Processing Ore code changes from Blood asps gt code 2016-09-28 23:09:15 +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
Dream-Master
125201371f try this for rounds 2016-09-28 01:25:38 +02:00
Dream-Master
f3076ed3ba Fix ?! 2016-09-28 01:11:20 +02:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02: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
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02:00
Dream-Master
55b735fc4f material fix 2016-09-24 00:55:35 +02:00
Technus
e765214bfd Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental 2016-09-24 00:23:01 +02:00
Technus
b0309a2ebd Remove Shit material 2016-09-24 00:22:26 +02:00
Dream-Master
2f4830b7ab material fix 2016-09-23 20:42:21 +02:00
Blood-Asp
154b13560a Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:46:13 +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
cc20b3d213 Fix missing code block 2016-09-23 19:20:30 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01:00
Technus
0bbc311204 Even less spaming scanner 2016-09-23 13:58:19 +02:00
Technus
bcb5902c62 Assline OK 2016-09-23 13:33:06 +02:00
Technus
9b08a7df97 More minor changes 2016-09-23 11:15:08 +02:00
Technus
f341e3327c Some minor change 2016-09-23 11:01:42 +02:00
Technus
5c34b0d4a6 Exposing more recipe adding functionality. 2016-09-23 10:53:45 +02:00
Dream-Master
fd6e25d380 add Mysterious Crystal 2016-09-22 23:55:58 +02:00
Technus
dbdc4f160a Merge branch 'Loading-Times' into experimental 2016-09-22 23:07:35 +02:00
Technus
41a91acd57 Bender derp fix 2016-09-22 23:06:26 +02:00
Blood-Asp
1d56d4fcb6 Proc Fix 2016-09-22 22:45:03 +02:00
Blood-Asp
58d753a5e6 After fix 598 2016-09-22 22:34:36 +02:00
Muramasa
ca620da531 Fixes #561 2016-09-22 22:32:33 +02:00
Muramasa
e8d75e0b40 Fix 559 2016-09-22 22:32:22 +02:00
Blood-Asp
476d65ea9d Fix tools and lag on reading tooltip 2016-09-22 22:26:16 +02:00
Muramasa
1b618500b3 Bool Const Changes 2016-09-22 22:22:30 +02:00
Technus
07ea1b18f1 Revert "Change max machine casings to UHV" 
This reverts commit 5cfce3ec9f.
 2016-09-22 22:11:27 +02:00
Dream-Master
5cfce3ec9f Change max machine casings to UHV 2016-09-22 22:10:32 +02:00
Muramasa
f27a4b9cbb MORE string var changes 2016-09-22 22:09:50 +02:00
Dream-Master
13ba045b34 Change max machine casings to UHV 2016-09-22 20:13:11 +02:00
Muramasa
99a17ad3ef Small fix 2016-09-22 19:26:30 +02:00
Muramasa
4378d8c673 Try Catch Changes 2016-09-22 19:26:18 +02:00
Muramasa
04fec51acb Remove null checks 2016-09-22 19:17:44 +02:00
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
a2b3a33963 Postinit reduction and save registered recipes. 2016-09-22 18:44:29 +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
0218bda946 Reauthored bees to GT 2016-09-21 22:22:59 +02:00
Technus
b374cf7a70 Tweaks 2016-09-21 22:22:41 +02:00
Technus
00c69b5a39 Scanner done. 2016-09-21 22:22:29 +02:00
Technus
205fd2bba4 scanner done 2016-09-21 22:22:21 +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
0153c13251 Scanner core scanning code changes 2016-09-21 22:16:40 +02:00
Technus
5680bf3cbd More Texture Work 2016-09-21 22:14:51 +02:00
Technus
8059f589c2 textures work 2016-09-21 22:14:43 +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
d02b7925f5 Fixed textures in correct place... 2016-09-21 22:07:48 +02:00
Technus
8f8a0e5ff3 Fixed more texture bug 2016-09-21 22:07:41 +02:00
Technus
43d8044658 Fixed last bug that prevented me from texting 2016-09-21 22:07:34 +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
c5eeb27cd6 Fixing INTEGER.MAX_VALUE culprit.... 2016-09-21 22:07:13 +02:00
Technus
7dfb3e0da9 Adjusting multiblocks for bettter tiering 2016-09-21 22:05:58 +02:00
Technus
222e8ee267 adding method to multibocks 2016-09-21 22:03:16 +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
Dream-Master
d8d2a5039a Material changes and names change 2016-09-21 21:59:43 +02:00
Technus
803c0e2bc6 Initial material change and tier expansion. 2016-09-21 21:50:43 +02:00
Dream-Master
0a04741a60 Added some magic Fuels and fixes 2016-09-21 21:36:51 +02:00
Dream-Master
29bff998bc Add Infinity as Material 
Add Cells to Infinity Catalyst, infinity and Bedrockium
 Add more Plasma and Cells to new Materials from GS
 2016-09-21 21:36:42 +02:00
Technus
12c9821ae9 Adding tiers to GT_Values 2016-09-21 21:36:35 +02:00
Daniel
9543983754 Update GT_RecipeAdder.java 2016-09-21 21:36:23 +02:00
Daniel
5cbf599eed Update IGT_RecipeAdder.java 2016-09-21 21:36:14 +02:00
Dream-Master
a1b83a26dd change compressor recipes 2016-09-20 22:45:56 +02:00
Dream-Master
b45d9d7356 recipe from HP and Plasma Turbine now in the Core Mod 2016-09-20 22:19:39 +02:00
Dream-Master
31c3876421 Revert "Revert "Changed get clay dust a bit. And diamond out of red sand"" 
This reverts commit 6675b4242e.
 2016-09-20 22:02:54 +02:00
Dream-Master
6675b4242e Revert "Changed get clay dust a bit. And diamond out of red sand" 
This reverts commit 641677c12e.
 2016-09-20 22:02:38 +02:00
Dream-Master
641677c12e Changed get clay dust a bit. And diamond out of red sand 2016-09-20 22:02:17 +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
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
Technus
a3ef374add Scanner done. 2016-09-08 23:50:16 +02:00
Technus
97fc6e6f4c scanner done 2016-09-08 23:43:46 +02: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
0cb17155d3 More work on scanner 2016-09-07 19:43:31 +02:00
Technus
6198b220ee Scanner 1 2016-09-07 19:43:12 +02:00
Technus
1fbd1ac81a Ading textures - if possible cherry pick into main 2016-09-07 19:25:05 +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
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
Dream-Master
0cc91372f9 remove empty class 2016-09-03 12:06:13 +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
Dream-Master
a280813749 remove pollution too 2016-09-03 00:48:38 +02:00
Dream-Master
b8aa41e9df Pollution remove 2016-09-03 00:45:47 +02:00
Martin Robertz
2672ea510d Change Long Rods to Rods 
Change Energy Values a bit.
 2016-09-02 09:57:29 +02:00
Martin Robertz
f80c4c8164 Change Long Rods to rods 2016-09-02 09:54:27 +02:00
Martin Robertz
8e14bb65b1 Merge pull request #15 from GTNewHorizons/Fusion-MORE-STUFF 
Update GT_MachineRecipeLoader.java
 2016-09-02 09:41:52 +02:00
Dream-Master
c1ba7dba21 Naquadah Reactor fixes Part 2 2016-09-01 23:49:16 +02:00
Daniel
8c6f35294e Update GT_MachineRecipeLoader.java 2016-09-01 23:45:23 +02:00
Daniel
662c0ad8e1 Update GT_MachineRecipeLoader.java 2016-09-01 23:43:30 +02:00
Dream-Master
b7046f9a6e Naquadah Reactor fixes 2016-09-01 23:36:02 +02:00
Daniel
e9e515df03 Update GT_MachineRecipeLoader.java 2016-09-01 23:22:12 +02:00
Dream-Master
5b3748fecd Add 2 more Naquadah Reactors in the Game. 
Tier 2 needs now Naquadah Long sticks

Tier 4 and 5 Needs Naquadria Long rods and naquadria Cells

Tier 1 80%, Tier 2 100%, Tier 3 125% Tier 4 150 % Tier 5 200%

Bolts = 25 Mio Eu
Long Rods 200 Mio EU
Cells 200 Mio EU
Long Rods NQX 500 Mio EU
Cells NQX 500 Mio EU
 2016-09-01 23:11:49 +02:00
Blood-Asp
b4049e88a2 Port GT6 TC load time improvements 2016-08-31 14:22:00 +02:00
Dream-Master
cd3d85849a reneame Infinity to Infinity Catalyst 2016-08-31 07:58:53 +02:00
Dream-Master
0b5335028d Added Bedrockium and Unstable dust for Byproducts 2016-08-30 10:07:24 +02:00
Dream-Master
eafafb3913 Add Infinity as Material 
Add Gold to Infused Gold as Byproduct
 2016-08-30 09:21:24 +02:00
Dream-Master
1e222dd8b3 fix 2016-08-28 00:11:51 +02:00
Dream-Master
8c496c8e52 fix 2016-08-27 23:46:19 +02:00
Dream-Master
8a4565ea38 add Pulverisation recipe with 4 Outputs and chances 2016-08-27 23:40:11 +02:00
Dream-Master
5697d39ea9 adding Pulverizion recipe with 4 Outputs 2016-08-27 23:20:29 +02:00
Dream-Master
895b9d32c5 recipe fix 2016-08-26 18:52:58 +02:00
Dream-Master
388227ed0c add more infused Gold recipes 2016-08-26 18:22:40 +02:00
Dream-Master
8dd77d3a90 remove Netherstar Ingots 2016-08-26 14:21:29 +02:00
Dream-Master
39eaf8c194 Added new Infused Gold recipes 2016-08-26 10:00:03 +02:00
Dream-Master
47d72fc4da Set Nether Star Ore 2016-08-25 21:17:08 +02:00
Dream-Master
cfdb3d835b fixes 2016-08-25 18:44:23 +02:00
Dream-Master
49023ca1c4 remove Teleporter from GT Code 
(Load Order)
 2016-08-25 18:16:15 +02:00
Blood-Asp
8086832d88 tmp fix for #595 2016-08-25 17:28:19 +02:00
Dream-Master
6125d94033 Tiered Teleporter to Fusion Tier 3 
Added reverse recipe for Super Conductor Blocks
 2016-08-25 15:42:16 +02:00
Dream-Master
b849c78fe5 Tiered Teleporter to LuV 2016-08-25 13:38:27 +02:00
Dream-Master
7e098d017b Fix #674 
Fusion Casings now  Assembler only recipes
Using new EBF Tiered Materials like HSSS and Naquadah Alloy.
 2016-08-25 13:11:58 +02:00
Léa Gris
2550d732e0 May or may not fix #565 (LeaGris) 2016-08-24 10:19:51 +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
Dream-Master
5a35be495e change Materials a bit 
Some Metallurgy Metal adds
 2016-08-23 22:57:31 +02:00
Blood-Asp
cff73fd5a3 #573 Turbines now explode when producing more EU than dynamo can handle 2016-08-23 18:42:23 +02:00
Dream-Master
1fc13df510 spell fix 2016-08-23 18:24:41 +02:00
Blood-Asp
49e5b53706 #573 Turbines now explode when producing more EU than dynamo can handle 2016-08-22 23:01:29 +02:00
Dream-Master
35f93bee68 Delete saved recipe on machine change(Blood Asp) 2016-08-22 22:46:15 +02:00
Blood-Asp
9ff430c80d Fix #598 Delete saved recipe on machine change 2016-08-22 22:38:28 +02:00
Dream-Master
aa33e48c88 Fix Assembly line work without energy(Muramasa) 
Assembly line dont work on Z coordinates.(Muramasa)
 2016-08-22 21:41:44 +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
Dream-Master
7a5d9b73d9 Add more mixed Metal Ingot combinations 2016-08-21 22:29:54 +02:00