aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2016-07-26Merge remote-tracking branch 'upstream/NewFeatures' into new-featuresDream-Master
2016-07-26Restored TextureSetsOneEyeMaker
2016-07-26fixesDream-Master
2016-07-26Merge remote-tracking branch 'upstream/NewFeatures' into new-featuresDream-Master
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-26Fixed merge conflicts.OneEyeMaker
2016-07-26c4bd35d7cd38db6af45723a359b7de5ffafa68f6OneEyeMaker
2016-07-26Fixed merge conflicts.OneEyeMaker
2016-07-26Merge branch 'experimental' into NewFeaturesOneEyeMaker
2016-07-26Coils should be deprecatedOneEyeMaker
2016-07-26Separated multiblock overlay and gui texturesMuramasa
2016-07-26Merge pull request #576 from Muramasa-/UBCSupportBlood-Asp
UBC Support / Ore System Restructure
2016-07-25Method simplificationMuramasa
Simplified some methods. Fixed incorrect honey requirement for scanning forestry species. Tweaked a tooltips.
2016-07-25final fixesDream-Master
2016-07-2513caf1d69955fd6be890b287cd30741c1a517a02OneEyeMaker
2016-07-25b6e4f869b8037d2590fb58571f9232c15eda38e5OneEyeMaker
2016-07-254aaafe53f5048e89e347dc899c625aaf772156a1OneEyeMaker
2016-07-25b3279513a3e1d80a8264a906bf2944fa362b2ac7OneEyeMaker
2016-07-252f454b9d824b1e6539b6d1b0607893ed4303e719OneEyeMaker
2016-07-2547ce8558682f5d1f3554ab1c2e3df46624838ca0OneEyeMaker
2016-07-25Fixed Blast Furnace recipe for Naquadah Alloy.OneEyeMaker
2016-07-25f98e51a82f646fa34172ce079a4b432ef3affffdOneEyeMaker
2016-07-25ea5305f7dfbb06b7285ee50a7406e2d67b666147OneEyeMaker
2016-07-258bf5b61dea476ce950ed523293658780217b203fOneEyeMaker
2016-07-25ce1e6917e056c0a1300caefc175b10c68126832aOneEyeMaker
2016-07-25ea5305f7dfbb06b7285ee50a7406e2d67b666147OneEyeMaker
2016-07-25Naquadah should be more expensive.OneEyeMaker
2016-07-258bf5b61dea476ce950ed523293658780217b203fOneEyeMaker
2016-07-25ce1e6917e056c0a1300caefc175b10c68126832aOneEyeMaker
2016-07-25Now Naquadria (source of Neutronium) requires highest tier of heating coils.OneEyeMaker
2016-07-25b780ef6c2cf222f84c2b426ae9c91071d54a8b15OneEyeMaker
2016-07-25c9bc17bce5bec26ec2795d12faeb02fcfcd9366eOneEyeMaker
2016-07-25Changed method of "repairing" of overheated coils.OneEyeMaker
Also moved initialization of SubTags to prevent NoClassDefFoundException.
2016-07-24Redesigned achievements.OneEyeMaker
2016-07-24Update GT_FuelLoader.javaDEMOOH
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
2016-07-24Changed Blast Furnace temperatures of some materials.OneEyeMaker
Now EV materials require HV+ heating coils, IV materials requires EV+ coils.
2016-07-23Fix "stone" veinsMuramasa
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-22Fix convertOreMuramasa
2016-07-22Fix harvest levelMuramasa
2016-07-22Various fixes/cleanupMuramasa
Game will no longer crash without UBC loaded Added missing mallet textures to materialicon Lignite
2016-07-21Any component should require cables of its tier.OneEyeMaker
2016-07-21Cables from IV materials and used as IV components should be IV.OneEyeMaker
2016-07-21Update GT_MachineRecipeLoader.javaDEMOOH
Added pitchblende multiplication recipe with Reactoria leaves.
2016-07-21Ore System Rewrite part 2Muramasa
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-21Redefined some wires. Added last heating coil block.OneEyeMaker
2016-07-20Fixed Blast Furnace recipe for Naquadah Alloy.OneEyeMaker
2016-07-20Added new tier of heating coils.OneEyeMaker
//TODO: Find material for LuV coils.
2016-07-18Fix MultismelterDream-Master
Change Wire recipe and Fix 643
2016-07-18Ore system rewriteMuramasa
2016-07-18Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatibleOneEyeMaker
Heating coils moved to separated block.
2016-07-18Restored broken compatibility.OneEyeMaker
generated by cgit (git 2.46.0) at 2025-03-06 23:47:07 +0000