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

995 commits

Author SHA1 Message Date
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
Dream-Master
949c7ba499 remove import 2016-08-21 21:22:28 +02:00
Dream-Master
ea307b2828 Should fix #666 
Teleporter need Neutronium Block
 2016-08-21 19:08:14 +02:00
Dream-Master
11d2e6a516 Fix #666 
GT Teleporter be Interdimentional with Block of Neutronium
 2016-08-20 18:23:37 +02:00
Dream-Master
1262129d8c remove ordict stuff and get it to the Core Mod 2016-08-19 21:56:24 +02:00
Dream-Master
7325494578 next try register all stuff 2016-08-19 21:23:47 +02:00
Dream-Master
b97e82da63 Added most of the Oredict Stuff from the script to GT 2016-08-19 20:20:45 +02:00
Dream-Master
6b305118af first step ordict stuff 2016-08-19 09:18:48 +02:00
Dream-Master
9fa6c9a40e Add new Materials 2016-08-18 14:58:26 +02: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
Dream-Master
d57c26a2a1 make adamantium ebf furnace required 2016-08-14 23:05:24 +02:00
Dream-Master
97aea575eb Now you need Ingots to make rounds 
remove nugget smelting in the fluid smelter
correcting the amount to craft Quintuple products
 2016-08-14 22:36:46 +02: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
Dream-Master
ee007402d8 added new recipe to Compressed Plates. 2016-08-10 23:12:09 +02: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
Blood-Asp
b3bd42ba8c Merge pull request #594 from Technus/experimental 
Paintable Wires
 2016-08-10 20:22:47 +02:00
Dream-Master
a944901807 some Material changes 2016-08-08 23:07:59 +02:00
Dream-Master
cf98730762 Adding Missing Materials to GT for Galaxy Space 1.10 Compat 2.6 2016-08-08 23:04:16 +02:00
Daniel
450bb19519 Paintable Wires 2016-08-07 08:39:14 +02:00
Dream-Master
bc0ec20f89 Change recipes for Sensors and Field Generators 2016-08-05 22:57:00 +02:00
Dream-Master
20572d5678 Change some materials. 2016-08-05 16:16:19 +02:00
Dream-Master
5efb45aa2d Remove Low and High Pressure Boiler from RC and add it to the Core Mod 2016-08-05 15:18:16 +02:00
Dream-Master
6e0081a170 Added Low and High Pressure Boiler from RC to the code new try 2016-08-05 10:55:56 +02:00
Dream-Master
c6245c56dc Added Low and High Pressure Boiler from RC to the code( Crafting Recipe and Assembler Recipe ) 2016-08-05 10:33:43 +02:00
Dream-Master
e6c4150cd9 Change Blast Furnace Temp a bit 2016-08-05 09:44:02 +02:00
Dream-Master
5894cb1e64 Change Emitter Recipes and Fix #649 2016-08-05 00:15:56 +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
Dream-Master
9418bc0954 Merge remote-tracking branch 'upstream/SmoothTransition' into experimental 
Conflicts:
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
 2016-07-27 17:23:49 +02:00
Dream-Master
da213797ac Merge remote-tracking branch 'upstream/Fixes' into experimental 
Conflicts:
	src/main/java/gregtech/GT_Mod.java
 2016-07-27 17:19:10 +02:00
Muramasa
50b9138321 Use GameRegistry 2016-07-27 17:18:10 +02:00
Muramasa
54d3a79809 a1a25d42dd 2016-07-27 17:17:58 +02:00
Blood-Asp
654efd8a25 Handle fuel value as integer 2016-07-27 17:07:14 +02:00
Draknyte1
55bf454318 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 17:06:18 +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
Dream-Master
05c272a5ec Put code to GT from Core Mod 2016-07-26 22:23:57 +02:00
Dream-Master
5b9614944a Emitter in GT Code 2016-07-26 21:09:04 +02:00
Dream-Master
7a872dfad2 Merge remote-tracking branch 'upstream/NewFeatures' into new-features 2016-07-26 19:41:49 +02:00
OneEyeMaker
9c788fa292 Restored TextureSets 2016-07-26 20:02:41 +03:00
Dream-Master
1512c3cdce fixes 2016-07-26 18:30:30 +02:00
Dream-Master
2efe1b9f51 Merge remote-tracking branch 'upstream/NewFeatures' into new-features 
Conflicts:
	.gitignore
	build.properties
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/ItemList.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/api/enums/OrePrefixes.java
	src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
	src/main/java/gregtech/api/util/GT_BaseCrop.java
	src/main/java/gregtech/api/util/GT_Recipe.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
	src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
	src/main/java/gregtech/common/GT_Worldgen_Stone.java
	src/main/java/gregtech/common/GT_Worldgenerator.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
	src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
	src/main/java/gregtech/common/blocks/GT_Block_Machines.java
	src/main/java/gregtech/common/blocks/GT_Block_Ores.java
	src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
	src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
	src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
	src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
	src/main/java/gregtech/common/covers/GT_Cover_Arm.java
	src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
	src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
	src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
	src/main/java/gregtech/common/covers/GT_Cover_Drain.java
	src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
	src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
	src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
	src/main/java/gregtech/common/covers/GT_Cover_Pump.java
	src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
	src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
	src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
	src/main/java/gregtech/common/gui/GT_Container_Filter.java
	src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
	src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
	src/main/java/gregtech/common/items/GT_SensorCard_Item.java
	src/main/java/gregtech/common/items/ItemComb.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
	src/main/java/gregtech/common/tools/GT_Tool.java
	src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
	src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
	src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
	src/main/java/gregtech/common/tools/GT_Tool_Sense.java
	src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
	src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
	src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
	src/main/resources/assets/gregtech/lang/en_US.lang
	src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
 2016-07-26 18:25:35 +02:00
OneEyeMaker
c014ae4afc Fixed merge conflicts. 2016-07-26 17:10:23 +02:00
OneEyeMaker
cda6044614 c4bd35d7cd 2016-07-26 17:07:31 +02: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
Dream-Master
0dc0085f6f final fixes 2016-07-25 23:20:48 +02:00
OneEyeMaker
96e9d081b1 13caf1d699 2016-07-25 23:16:43 +02:00
OneEyeMaker
c485ef4720 b6e4f869b8 2016-07-25 23:13:40 +02:00
OneEyeMaker
90aa3b51a7 4aaafe53f5 2016-07-25 23:11:56 +02:00
OneEyeMaker
9575e565fd b3279513a3 2016-07-25 23:03:52 +02:00
OneEyeMaker
d8b84d375c 2f454b9d82 2016-07-25 22:58:04 +02:00
OneEyeMaker
1f1664152c 47ce855868 2016-07-25 22:55:51 +02:00
OneEyeMaker
0ee26eddb2 Fixed Blast Furnace recipe for Naquadah Alloy. 2016-07-25 22:53:28 +02:00
OneEyeMaker
d0396c268c f98e51a82f 2016-07-25 22:53:13 +02:00
OneEyeMaker
aca07ff36e ea5305f7df 2016-07-25 22:51:10 +02:00
OneEyeMaker
6121acb843 8bf5b61dea 2016-07-25 22:48:54 +02:00
OneEyeMaker
f365377332 ce1e6917e0 2016-07-25 22:45:30 +02:00
OneEyeMaker
718d28bd23 ea5305f7df 2016-07-25 22:36:29 +02:00
OneEyeMaker
18ab1c12cc Naquadah should be more expensive. 2016-07-25 22:32:51 +02:00
OneEyeMaker
0fb3329176 8bf5b61dea 2016-07-25 22:32:25 +02:00
OneEyeMaker
e3d5764684 ce1e6917e0 2016-07-25 22:29:30 +02:00
OneEyeMaker
b3777e1eca Now Naquadria (source of Neutronium) requires highest tier of heating coils. 2016-07-25 22:23:38 +02:00
OneEyeMaker
218d45c99d b780ef6c2c 2016-07-25 22:23:13 +02:00
OneEyeMaker
49c063f24a c9bc17bce5 2016-07-25 22:18:51 +02:00
OneEyeMaker
13caf1d699 Changed method of "repairing" of overheated coils. 
Also moved initialization of SubTags to prevent NoClassDefFoundException.
 2016-07-25 11:33:07 +03:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
DEMOOH
a5ba9e57fa Update GT_FuelLoader.java 
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
 2016-07-24 15:32:26 +03:00
OneEyeMaker
4aaafe53f5 Changed Blast Furnace temperatures of some materials. 
Now EV materials require HV+ heating coils, IV materials requires EV+ coils.
 2016-07-24 10:27:03 +03:00
Muramasa
d756cebd17 Fix "stone" veins 
Fix an issue where an "stone" vein would override ore textures but not
other stones.
Added missing small ore for marble and basalt.
Removed wither check from Block_Stones.
 2016-07-23 03:09:25 +01:00
Muramasa
2704680a2e Fix convertOre 2016-07-22 04:31:57 +01:00
Muramasa
5fe4798e6b Fix harvest level 2016-07-22 02:58:39 +01:00
Muramasa
676e326ec0 Various fixes/cleanup 
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
 2016-07-22 01:41:51 +01:00
OneEyeMaker
b3279513a3 Any component should require cables of its tier. 2016-07-21 16:59:56 +03:00
OneEyeMaker
2f454b9d82 Cables from IV materials and used as IV components should be IV. 2016-07-21 13:22:28 +03:00
DEMOOH
aa2196978b Update GT_MachineRecipeLoader.java 
Added pitchblende multiplication recipe with Reactoria leaves.
 2016-07-21 11:28:19 +03:00
Muramasa
248ce596a5 Ore System Rewrite part 2 
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
 2016-07-21 07:24:42 +01:00
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
b7943a30c3 Fixed Blast Furnace recipe for Naquadah Alloy. 2016-07-20 10:45:46 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils. 
//TODO: Find material for LuV coils.
 2016-07-20 10:27:47 +03:00
Dream-Master
eeab702de4 Fix Multismelter 
Change Wire recipe and Fix 643
 2016-07-18 22:32:39 +02:00
Muramasa
de6e90a000 Ore system rewrite 2016-07-18 19:00:53 +01:00
OneEyeMaker
bd689c6253 Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible 
Heating coils moved to separated block.
 2016-07-18 15:44:35 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
2b9d87f293 Naquadah should be more expensive. 2016-07-18 10:16:55 +03:00
OneEyeMaker
8bf5b61dea Moved all coils to another block. 2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +03:00
OneEyeMaker
effe6699f5 Now Naquadria (source of Neutronium) requires highest tier of heating coils. 2016-07-17 17:29:18 +03:00
OneEyeMaker
b780ef6c2c Updated tooltips 2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5 Added new heating coil blocks. 2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5 Initial 
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
 2016-07-16 23:48:25 +01:00
DEMOOH
8419ddaefc Update GT_Cover_Fluidfilter.java 2016-07-17 00:07:10 +03:00
Dream-Master
c3ccf315a2 Add shaped crafting recipe for springs 2016-07-15 22:35:15 +02:00
Dream-Master
f4d10ee72f change recipe for small springs 2016-07-15 22:17:47 +02:00
Dream-Master
8cb17b20c0 Adding Shaped recipe for small springs 2016-07-15 00:21:18 +02:00
Martin
2a4e2aa133 Remove ghost items from Assembly Line input slots (Blood Asp) 2016-07-13 16:25:28 +02:00
Blood-Asp
be3a6292bb Remove ghost items from Assembly Line input slots 2016-07-12 22:04:36 +02:00
Blood-Asp
435c3cd526 Update GT Capelist URL 2016-07-10 20:28:35 +02:00
Dream-Master
4030ef4f1c Change graphic 2016-07-05 19:58:04 +02:00
Dream-Master
509b904d4e Change graphics 2016-07-05 19:54:33 +02:00
Dream-Master
98ec8a6bdd Fix id 2016-07-05 19:43:45 +02:00
Dream-Master
f1f3c8673b Fixing Ids. 2016-07-05 19:25:36 +02:00
Dream-Master
32a4f8be83 Added LuV, ZPM and UV Mob Rep 
Changed ids from Fluid regulators because overlays ids.
 2016-07-05 19:20:20 +02:00
Dream-Master
467f983190 Change Pile Igniter recipe to be LV Steel. 2016-07-04 22:50:39 +02:00