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 |
|
Blood-Asp
|
bd51aba156
|
Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
|
2016-07-26 00:56:21 +02:00 |
|
OneEyeMaker
|
96e9d081b1
|
13caf1d699
|
2016-07-25 23:16:43 +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
|
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
|
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
|
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 |
|
OneEyeMaker
|
b3279513a3
|
Any component should require cables of its tier.
|
2016-07-21 16:59:56 +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 |
|
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
|
a9039f249a
|
Finished adding all component assemblyline recipes (Blood Asp)
|
2016-07-04 17:39:38 +02:00 |
|
Blood-Asp
|
c120f69351
|
Finished adding all component assemblyline recipes
|
2016-07-02 19:05:17 +02:00 |
|
Dream-Master
|
ae5626bc38
|
More fixes
Naquadah Alloy and Osmiridium
|
2016-07-02 12:10:30 +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 |
|
Dream-Master
|
df720f7ace
|
Adding Blood Infused Iron to GT
More recipe changes (Blood Asp)
|
2016-07-02 11:31:02 +02:00 |
|
Blood-Asp
|
c320af9f3e
|
Even more changes
|
2016-07-01 22:23:04 +02:00 |
|
Dream-Master
|
e10a473d31
|
visual changes
|
2016-07-01 22:16:20 +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 |
|
Blood-Asp
|
bcbeebf3b8
|
First Assemblyline recipes
|
2016-07-01 02:06:51 +02:00 |
|
Dream-Master
|
857fb7ec02
|
Assembly Line recipe work (Blood Asp)
|
2016-06-30 21:24:13 +02:00 |
|
Blood-Asp
|
90d776893e
|
More Assembly Line recipe work
|
2016-06-30 00:12:00 +02:00 |
|
Blood-Asp
|
b9ee95c797
|
AL Recipe work
|
2016-06-27 23:49:18 +02:00 |
|
Dream-Master
|
5de110ad42
|
This works
HeeEndium
|
2016-06-26 23:43:15 +02:00 |
|
Blood-Asp
|
01b15f4251
|
Make Railcraft item Retrival name independent
|
2016-06-25 00:24:25 +02:00 |
|
Dream-Master
|
5e1720e282
|
Revert "make steam boilers not automatable"
|
2016-06-24 20:44:28 +02:00 |
|
Dream-Master
|
efaa163cfe
|
Fix Superfuel railcraft compat and expand thaumcraft check (Blood Asp)
|
2016-06-24 19:35:57 +02:00 |
|
Blood-Asp
|
e21311b919
|
Fix Superfuel railcraft compat and expand thaumcraft check
|
2016-06-24 17:49:22 +02:00 |
|
Dream-Master
|
8a3ed09c46
|
Blood Asp changes
|
2016-06-24 01:32:57 +02:00 |
|
Blood-Asp
|
cea067c613
|
More superfuel fixes
|
2016-06-24 01:08:26 +02:00 |
|
Blood-Asp
|
25a0b460d4
|
Fix fluiddeath
|
2016-06-24 00:57:45 +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 |
|
Blood-Asp
|
210fc268b1
|
Remove old crop processing code
|
2016-06-23 19:31:02 +02:00 |
|
Blood-Asp
|
1d9eb4093e
|
Readjusted Notch Apple fuel value
|
2016-06-23 18:45:59 +02:00 |
|
Blood-Asp
|
11721a7765
|
Changed Field Generator recipes
|
2016-06-23 01:02:58 +02:00 |
|
Dream-Master
|
cbd8034169
|
move a lot of Machine recipe to the core mod.
Method code to long
|
2016-06-22 23:03:10 +02:00 |
|
Dream-Master
|
9f15393154
|
a874d9dd88 [a874d9d]
|
2016-06-22 22:51:14 +02:00 |
|
Dream-Master
|
024fbb4ed4
|
make Neutronium cheaper
|
2016-06-22 22:40:34 +02:00 |
|