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

325 commits

Author SHA1 Message Date
Blood-Asp
154b13560a Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:46:13 +02:00
Technus
41a91acd57 Bender derp fix 2016-09-22 23:06:26 +02:00
Muramasa
1b618500b3 Bool Const Changes 2016-09-22 22:22:30 +02:00
Muramasa
f27a4b9cbb MORE string var changes 2016-09-22 22:09:50 +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
436389d3f1 For Loop Changes 2016-09-22 18:40:19 +02:00
Technus
0218bda946 Reauthored bees to GT 2016-09-21 22:22:59 +02:00
Technus
e9db0f877f Fix Proc even more! 2016-09-21 22:07:55 +02:00
Dream-Master
d8d2a5039a Material changes and names change 2016-09-21 21:59:43 +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
Martin Robertz
2672ea510d Change Long Rods to Rods 
Change Energy Values a bit.
 2016-09-02 09:57:29 +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
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
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
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
Dream-Master
5a35be495e change Materials a bit 
Some Metallurgy Metal adds
 2016-08-23 22:57:31 +02:00
Dream-Master
7a5d9b73d9 Add more mixed Metal Ingot combinations 2016-08-21 22:29:54 +02:00
Dream-Master
ea307b2828 Should fix #666 
Teleporter need Neutronium Block
 2016-08-21 19:08:14 +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
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
Dream-Master
ee007402d8 added new recipe to Compressed Plates. 2016-08-10 23:12:09 +02:00
Dream-Master
bc0ec20f89 Change recipes for Sensors and Field Generators 2016-08-05 22:57:00 +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
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