Muramasa
50b9138321
Use GameRegistry
2016-07-27 17:18:10 +02:00
Muramasa
54d3a79809
a1a25d42dd
2016-07-27 17:17:58 +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
cda6044614
c4bd35d7cd
2016-07-26 17:07:31 +02: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
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
96e9d081b1
13caf1d699
2016-07-25 23:16:43 +02:00
OneEyeMaker
1f1664152c
47ce855868
2016-07-25 22:55:51 +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
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
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
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
f98e51a82f
Added new tier of heating coils.
...
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03: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
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
Dream-Master
8a3ed09c46
Blood Asp changes
2016-06-24 01:32:57 +02:00
Blood-Asp
72ff25f9b7
Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values
2016-06-23 23:43:22 +02:00
Dream-Master
7cf4b14004
3af174488a [ 3af1744]
2016-06-22 21:12:55 +02: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
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
Blood-Asp
ffd9964cd3
Changed Bittle charcoal tool back to axe
2016-06-19 19:02:48 +02:00
Blood-Asp
3a249d8075
Merge pull request #500 from Muramasa-/DieselGenerator
...
Large Diesel Generator
2016-06-19 17:12:23 +02:00
MauveCloud
d1b737c6cc
Fixed incomplete redo of brittle charcoal adventure fix
...
(had reverted after improper testing with axe instead of shovel, then
neglected to check rebuilding with gradle after re-implementing fix in
source)
2016-05-26 09:57:39 -07:00
MauveCloud
f5bb397009
Reinforced Block and Brittle Charcoal fixes
...
Added fixes for #503 and #436
2016-05-26 07:43:02 -07:00
Dream-Master
78c691d754
Adding the New Turbines from Gt 5.09 and some Assembler recipe
2016-05-25 21:43:52 +02:00
Muramasa
8880eb8d6d
Basically a rewrite
2016-05-20 05:36:32 +01:00
MauveCloud
b69385d29b
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental
2016-04-28 11:30:29 -07:00
MauveCloud
a88988770b
Improved brittle charcoal handling.
2016-04-28 11:30:00 -07:00
Muramasa
12a1d1c46e
Main Commit
2016-04-19 23:17:31 +01:00
Muramasa
79444adc76
Revert "Turbine Rebalance"
...
This reverts commit ddc0c4299e
2016-04-17 07:41:35 +01:00
