aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Proxy.java
AgeCommit message (Collapse)Author
2016-11-01Rework oil genTechnus
2016-11-01Fix ignored oredict names list not workingBlood-Asp
2016-10-29Fix random sound bugBlood-Asp
2016-10-20Truncate ( )Technus
2016-10-19Remove Character.ValueOfTechnus
2016-10-14drop items from exploding gt machines + configBlood-Asp
2016-10-07GT crop nerf and separate comb nerf configMuramasa
2016-10-07HARD CHANGESTechnus
2016-10-02Better balance of pollution, adjusted timerTechnus
2016-10-02Numbers Crunched For Simulated PollutionTechnus
2016-10-02Lesser numbers for pollutionTechnus
2016-10-02Fix pollution onWorldTick server crashMuramasa
2016-10-02Pollution Bloodasp3Blood-Asp
2016-10-02Readd pollution doneTechnus
2016-09-23Revert "random code changes"Technus
This reverts commit 92e2c32df6a857dc7dedfccc054b97d6fcbe34d2.
2016-09-23random code changesDream-Master
@Technus can you verifying if this code please
2016-09-22Try Catch ChangesMuramasa
2016-09-22Concurrent Hash maps and string varsMuramasa
2016-09-03Pollution removeDream-Master
2016-08-14Now you need Ingots to make roundsDream-Master
remove nugget smelting in the fluid smelter correcting the amount to craft Quintuple products
2016-07-27Handle fuel value as integerBlood-Asp
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-25Method simplificationMuramasa
Simplified some methods. Fixed incorrect honey requirement for scanning forestry species. Tweaked a tooltips.
2016-07-04More Pollution workDream-Master
2016-07-03More Pollution workBlood-Asp
2016-06-26This worksDream-Master
HeeEndium
2016-06-24Blood Asp changesDream-Master
2016-06-24More superfuel fixesBlood-Asp
2016-06-23missed a bitBlood-Asp
2016-06-23Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block ↵Blood-Asp
fuel values
2016-06-22d718cac331526a1d13a4df12fba42ef01028bd90 [d718cac]Dream-Master
2016-06-22remove Nugget to Ingot recipe.Dream-Master
If i know this before i never wrote hundreds of MT Lines
2016-06-2291d34c2c684a5baead3b59c82ea980632e6e2686 [91d34c2]Dream-Master
2016-06-21experimental branchDream-Master
2016-06-21reverse commitDream-Master
2016-06-21even with Blood asp experimental branchDream-Master
2016-06-21remove allDream-Master
2016-06-20Corrected Wood Plates burn valueBlood-Asp
2016-06-19Blacklist Unstable Ingots from unificationBlood-Asp
2016-05-22Change Fuel and Nitro diesel valuesDream-Master
change Burn value of Lignite coal 4x Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
2016-05-18Added configuration file to enabling processing of oresOneEyeMaker
2016-04-09Revert "Try to add Oil Drill. Works but not pumping oil"Dream-Master
This reverts commit 26f65443ff25de28f0a48b0e5fa824ee96f86c41.
2016-04-04Try to add Oil Drill. Works but not pumping oilDream-Master
2016-03-27Show all ingot fluid extractions and all iron/copper arc furnace recipesBlood-Asp
2016-03-20Hiding of Recycling recipes and unneeded ores in NEIBlood-Asp
2016-01-14Modify Wet Concrete to be able to use cellsTeteros
Wet Concrete was lacking cell support as it was a 'molten' fluid type. This patch adds a new type 'wet', which replaces 'molten' for Concrete. This means with this patch you can either use the canner with concrete dust to fill the cell, or the fluid canning machine to input or output Wet Concrete. Ideally Wet Concrete would be separate from Concrete as one is solid and the other fluid, but they were kept together for compatibility with existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block 'Wet' fluid type can be used anytime you'd like both solid and fluid cell support, as these were usually separate for good reasons. Mostly to prevent the awkward ratio above.
2015-12-29Revert "Fixed world event lag and related cauldron crash (LemADEC)"Dream-Master
This reverts commit 10d1e48220974c1c39e96e84108f8b908b0b43b1.
2015-12-29Revert "Fixed world event lag and related cauldron crash"Blood-Asp
2015-12-28fix armor textures and initBlood-Asp
2015-12-22Fixed world event lag and related cauldron crash (LemADEC)Dream-Master