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
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
9946e904b4
Merge branch 'experimental' into NewFeatures
2016-07-26 09:01:16 +03:00
Muramasa
16cac26b72
Separated multiblock overlay and gui textures
2016-07-26 00:52:30 +01: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
OneEyeMaker
90aa3b51a7
4aaafe53f5
2016-07-25 23:11:56 +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
0fb3329176
8bf5b61dea
2016-07-25 22:32:25 +02:00
OneEyeMaker
e3d5764684
ce1e6917e0
2016-07-25 22:29:30 +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
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
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
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
ea5305f7df
Restored broken compatibility.
2016-07-18 14:56:21 +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
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
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
Dream-Master
3ce817dddb
More Pollution work
2016-07-04 18:41:53 +02:00
Dream-Master
a22dc1f3e4
Pollution base work (Blood Asp)
2016-07-04 18:37:34 +02:00
Dream-Master
51f2d56284
Name fixes Assembly Line (Blood Asp)
2016-07-04 17:53:32 +02:00
Dream-Master
b99feff3d8
make GT trigger ic2 achievements (Blood Asp)
2016-07-04 17:46:17 +02:00
Blood-Asp
57deb3b3e1
Pollution basework
2016-07-03 18:31:06 +02:00
Blood-Asp
d21357bd84
Name fixes
2016-07-03 12:37:21 +02:00
Blood-Asp
ca0b8f396e
make GT trigger ic2 achievements
2016-07-02 22:35:29 +02:00
Dream-Master
6cff64480a
Adding new Tooltip to Assembly Line
...
Adding Iridium and Naquada ingots in EBF
Fix zpm Motor (Blood Asp)
2016-07-02 11:49:10 +02:00
Blood-Asp
c2be6ff64c
Small fixes and rebalances
2016-07-01 21:44:44 +02:00
Dream-Master
a560557fdf
fix Stuff
2016-07-01 18:54:08 +02:00
Dream-Master
aa35ec7ccd
Turbine tooltip fixes(Muramasa)
2016-07-01 09:05:24 +02:00
Blood-Asp
1497dc47e5
Merge pull request #550 from Muramasa-/Default
...
Turbine tooltip fixes
2016-07-01 01:16:10 +02:00
Blood-Asp
f496def067
Fixed Pyrooven overclocking
2016-07-01 01:14:35 +02:00
Blood-Asp
73749472d2
Finish Assemblyline recipe printing
2016-07-01 01:13:09 +02:00
Dream-Master
c3fcd31146
Finish Assemblyline recipe check (Blood Asp)
2016-06-30 22:28:48 +02:00
Blood-Asp
7ee09889d9
Finish Assemblyline recipe check
2016-06-30 22:17:18 +02:00
Dream-Master
857fb7ec02
Assembly Line recipe work (Blood Asp)
2016-06-30 21:24:13 +02:00
Dream-Master
7c6c34ed0f
Make plasma turbine output cooled versions of plasma (Blood Asp)
2016-06-30 20:18:58 +02:00
Muramasa
d8df9e1565
Turbine tooltip fixes
2016-06-30 18:14:34 +01:00
Blood-Asp
173e5a11d7
Merge pull request #547 from perkinslr/experimental
...
Make plasma turbine output cooled versions of plasma
2016-06-30 14:49:25 +02:00
Logan Perkins
ad8ad42542
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
2016-06-29 22:37:41 -07:00
Blood-Asp
90d776893e
More Assembly Line recipe work
2016-06-30 00:12:00 +02:00
Dream-Master
02c801afac
fix
2016-06-29 08:48:37 +02:00
Dream-Master
db3b2e1a4a
fix adv miner
...
comit form perkinslr
2016-06-28 08:49:31 +02:00
Logan Perkins
fcb685693e
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:28:18 -07:00
Logan Perkins
9be4d8c270
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:20:47 -07:00
Logan Perkins
4adb6554c2
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-27 17:12:02 -07:00
Dream-Master
3d9a779242
fix thanks @Muramasa
2016-06-27 16:56:24 +02:00
Dream-Master
33722641e6
change back name
2016-06-26 11:12:19 +02:00
Logan Perkins
dfb263e7dd
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-25 15:43:13 -07:00
Dream-Master
e59aa14e5e
fix
2016-06-25 11:26:55 +02:00
Dream-Master
a99ba0e265
Silk-touch then pulverize ores in advanced miner II
2016-06-25 11:25:23 +02:00
Logan Perkins
1fe2787532
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 20:50:10 -07:00
Logan Perkins
577ea17e65
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 20:45:04 -07:00
Logan Perkins
9ed45df5b7
Update GT_MetaTileEntity_AdvMiner2.java
2016-06-24 16:18:03 -07:00
Dream-Master
5e1720e282
Revert "make steam boilers not automatable"
2016-06-24 20:44:28 +02:00
Dream-Master
8a3ed09c46
Blood Asp changes
2016-06-24 01:32:57 +02:00
Muramasa
5263c85dc5
Fuel efficiency changes for Large Diesel Engine
2016-06-23 20:02:43 +01:00
Dream-Master
5ba763562b
no no no
2016-06-22 23:12:57 +02:00
Dream-Master
e1ebdd82f8
e8936bf8d9
...
AdvMinerII: check that ore block still exists; consider chance output
2016-06-22 23:11:45 +02:00
Dream-Master
759ff09662
9ea49989b6
[ 9ea4998
]
2016-06-22 22:42:28 +02:00
Dream-Master
64c0c1ca9d
c68814f780
[ c68814f
]
2016-06-22 21:24:15 +02:00
Dream-Master
d52d256f57
1412d578cb
[ 1412d57
]
2016-06-22 21:16:01 +02:00
Dream-Master
7cf4b14004
3af174488a
[ 3af1744
]
2016-06-22 21:12:55 +02:00
Dream-Master
10a1a2ee47
Adv Mine 2 Texture
2016-06-22 20:30:31 +02:00
Dream-Master
e0fe711de5
b4bfeb21f8
[ b4bfeb2
]
2016-06-22 19:35:03 +02:00
Techlone
ee2abbd3f2
AdvMinerII: check that ore block still exists; consider chance output
2016-06-22 01:30:27 +05:00
Dream-Master
e29201f753
new files from gt pull requests
2016-06-21 21:36:03 +02:00
Dream-Master
a88d9c4e72
experimental branch
2016-06-21 21:07:14 +02:00
Blood-Asp
7a9c3857e2
Merge pull request #526 from perkinslr/experimental
...
Make processing array handle multiple input stacks at a time
2016-06-21 19:56:34 +02:00
Dream-Master
fafe1bcc88
reverse commit
2016-06-21 19:32:31 +02:00
Dream-Master
09add3e8ac
even with Blood asp experimental branch
2016-06-21 18:50:29 +02:00
Dream-Master
b09b54435f
remove all
2016-06-21 18:42:02 +02:00
Muramasa
7e52fb2805
Bug fixes for my commits
...
Removed commented out old turbine texture code
Fixed Diesel Engine "Fuel Value" unit to EU/L
Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes.
Forgot to add recipe for Engine Intake.
Redone the Gas/HPSteam turbine recipes.
Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but
not enough for the engine to run
Updated Engine GUI
2016-06-21 00:17:21 +01:00
Logan Perkins
f16aeb2d1f
Update GT_MetaTileEntity_ProcessingArray.java
2016-06-19 15:58:04 -07:00
Blood-Asp
77a163e0e4
Fix infinite miningpipes exploit from advanced miner 2
2016-06-20 00:21:41 +02:00
Blood-Asp
2427bc1521
Make distillation tower work with different fluids in input hatches
2016-06-19 22:02:19 +02:00
Blood-Asp
6b556371aa
Fixed Entchanted Books in magic absorber
2016-06-19 20:36:49 +02:00
Blood-Asp
20201d069a
Fixed Magic Energy Absorber efficiency calculation
2016-06-19 20:23:49 +02:00
Blood-Asp
7424f75315
Added missing machines to processing array
2016-06-19 19:15:07 +02:00
Blood-Asp
3a249d8075
Merge pull request #500 from Muramasa-/DieselGenerator
...
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Techlone
ef23dc90b2
Fix #469 #508
2016-06-19 18:03:01 +05:00
Muramasa
58ed5088e1
Final commit
2016-06-12 19:32:29 +01:00
Logan Perkins
c596231af4
Make processing array use all input stacks
2016-06-12 10:39:33 -07:00
Muramasa
237e5e682d
Possibly final commit
2016-06-01 06:34:33 +01:00
Technus
9ea49989b6
Minor Fix
...
Actually makes the smelt at once cap bigger.
2016-05-30 21:12:25 +02:00
Dream-Master
5c46e9fb88
wrongly remove Code
2016-05-26 00:10:56 +02:00
Dream-Master
ef617a041e
fix
2016-05-25 23:40:43 +02:00
Dream-Master
9af2049318
Adding Assembly Line (no Assembler Casing recipe yet)
2016-05-25 23:34:55 +02:00
Dream-Master
78c691d754
Adding the New Turbines from Gt 5.09 and some Assembler recipe
2016-05-25 21:43:52 +02:00