aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
AgeCommit message (Collapse)Author
2016-10-20Truncate ( )Technus
2016-10-19Remove Character.ValueOfTechnus
2016-10-08Optimize imports (Intelli J)Technus
2016-10-07Machine code changes from bloodasp codeTechnus
2016-09-22MORE string var changesMuramasa
2016-09-22Try Catch ChangesMuramasa
2016-09-22Remove null checksMuramasa
2016-09-22Concurrent Hash maps and string varsMuramasa
2016-09-22For Loop ChangesMuramasa
2016-09-22Worldgen and random changesMuramasa
2016-09-21more work on ultimat-er batteryTechnus
2016-09-21no messageTechnus
2016-08-05Change recipes for Sensors and Field GeneratorsDream-Master
2016-08-05Change Emitter Recipes and Fix #649Dream-Master
2016-07-26Put code to GT from Core ModDream-Master
2016-07-26Emitter in GT CodeDream-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-18Ore system rewriteMuramasa
2016-07-05Fix idDream-Master
2016-07-05Fixing Ids.Dream-Master
2016-07-05Added LuV, ZPM and UV Mob RepDream-Master
Changed ids from Fluid regulators because overlays ids.
2016-07-01Even more changesBlood-Asp
2016-07-01PR fixes: Turbine casings readded, Dieselgen readded, balancing changesBlood-Asp
Also deactivated higher tier pumps, these cover so huge areas, that servers lag extremely. Nerfed new cables a bit.
2016-07-01First Assemblyline recipesBlood-Asp
2016-07-01Adding LuV, ZPM and UV componentsBlood-Asp
2016-06-25revert delete beesDream-Master
2016-06-25reverse commitDream-Master
2016-06-25remove Bees moduleDream-Master
2016-06-24Blood Asp changesDream-Master
2016-06-23Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block ↵Blood-Asp
fuel values
2016-06-23Changed Field Generator recipesBlood-Asp
2016-06-22754300d8fd9718833d16ed412429e2610f010422 [754300d]Dream-Master
2016-06-220a5ea5afae4e47d8ac9cd413b9a039c8971149e9 [0a5ea5a]Dream-Master
2016-06-229b6927e8e345f789237b0f381e65381454ec7757 [9b6927e]Dream-Master
2016-06-22e85a2d3e8a92a1cc744573c6a6eae5895bb58a92 [e85a2d3]Dream-Master
2016-06-22New Large Fluid CellsDream-Master
2016-06-22952c9d72b0691c875d37183cc817a5c43d0de11f [952c9d7]Dream-Master
2016-06-22b563a16e71e5e40df697afa3dea6435dc505bfaf [b563a16]Dream-Master
2016-06-22abc6cfc291929603cf963990982d58bf6f66b349 [abc6cfc]Dream-Master
2016-06-22Error fixesDream-Master
2016-06-222cab6b81666d27f4212b5dfbb2919969cfe52e31 [2cab6b8]Dream-Master
2016-06-224521769f7ba6471dbc37d08177953c7ccac47b75 [4521769]Dream-Master
2016-06-22543f71cc971f6316b3b70ee94bfa399c76d440cd [543f71c]Dream-Master
2016-06-22b0e7ffa8e5ae0e8dc4ece909c19a2e41c40b907d [b0e7ffa]Dream-Master
2016-06-22898a045a97bf2a04fe41644cc7db8e70cefab090 [898a045]Dream-Master
2016-06-2287c81f8d85793df6cfe7fb126b325d9a7554c73b [87c81f8]Dream-Master
2016-06-21new files from gt pull requestsDream-Master
2016-06-21experimental branchDream-Master
2016-06-21Fix fced86e11af35318bf3ef4129dd5a6584ad079e0 hiding almost all metaitemsBlood-Asp
2016-06-21reverse commitDream-Master