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
4c20885d14
Merge pull request #3 from Blood-Asp/experimental
...
Update changes
2016-07-26 07:42:29 +03:00
OneEyeMaker
c4bd35d7cd
Coils should be deprecated
2016-07-26 07:31:57 +03:00
Blood-Asp
3abf4381db
Merge pull request #580 from Muramasa-/Fixes
...
Separated multiblock overlay and gui textures
2016-07-26 01:57:27 +02: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
Blood-Asp
5a15ee7e4a
Merge pull request #568 from DEMOOH/experimental
...
Fluid Filter, Reactoria, MK3 Naquadah reactor fixes
2016-07-26 00:25:25 +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
Dream-Master
ee9a80810a
bump version
...
Puh a lot of work
(git checkout -b otherrepo-master master
git remote add upstream git://github.com/xxxxxx
git fetch upstream
git checkout master)
2016-07-25 23:19:06 +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
1b9536c1db
Merge pull request #2 from OneEyeMaker/WiresRedefinition
...
Redefined some wires.
2016-07-21 17:05:02 +03: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
