Technus
0ce4e84512
Disable , unused
2017-04-27 19:43:12 +02:00
Technus
00abad266c
Merge branch 'unstable' into mergeGTNH
...
# Conflicts:
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.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_GasTurbine.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
# src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
2017-04-27 19:42:17 +02:00
Technus
244ef3810e
Buildable
2017-04-27 19:03:07 +02:00
Blood-Asp
e7d8d5ecbe
Merge pull request #1025 from JohannesGaessler/SteamProductionImprovement
...
Steam production improvement / Tooltip improvement / Pollution adjustment
2017-04-27 18:26:42 +02:00
Technus
f6214c5b25
Merge branch 'unstable' into mergeGTNH
2017-04-27 17:11:52 +02:00
Technus
929073a7ae
Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)
...
# Conflicts:
# 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/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.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_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.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/gui/GT_Container_Regulator.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_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.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_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.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_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.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_Charcoal_Pit.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_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.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_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.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/oreprocessing/ProcessingWire16.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_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.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_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png
2017-04-27 17:06:22 +02:00
Techlone
cae69aa28f
Fix eu consumption absence by AssemblyLine and some clean up
2017-04-27 19:35:07 +05:00
Techlone
cff6b44a84
Formatting clean up, nothing else
2017-04-27 16:32:27 +05:00
Johannes Gäßler
eb45688648
Fixed a bug where excess fuel didn't consider the distortion from
...
runtimeBoost.
Adjusted the decimal points of the Large Boiler fuel tab to better
represent the actual burn times.
2017-04-27 00:28:07 +02:00
Johannes Gäßler
baa9caf06b
Eliminated rounding errors that caused fuel to burn too shortly
...
The Large Boiler now saves excess fuel between items, greatly improves
performance of items like sticks and planks.
The Large boiler now stores excess projected EU that is lost when
throttling with an integrated circuit
2017-04-26 23:57:10 +02:00
Johannes Gäßler
8f4225f0b8
Refactored mDescription to mDescriptionArray, added a deprecated field
...
mDescription to ensure 100% backwards compatibility
2017-04-26 20:37:47 +02:00
Johannes Gäßler
878738a75c
Corrected the Maintenance Hatch tooltip
2017-04-24 23:55:42 +02:00
Johannes Gäßler
1c75968fad
Fixed the GTLog spam, ty Techlone
2017-04-24 23:40:24 +02:00
Johannes Gäßler
c2c9fad120
Fixed a bug that caused Battery Buffers to not have a tooltip
2017-04-24 20:50:08 +02:00
Johannes Gäßler
2ca81b2828
Changed the wording on heating capacity to make the effects more clear.
2017-04-23 10:45:07 +02:00
Johannes Gäßler
f1ab33d996
Added information on how Heat Capacity surplus influences recipe time
2017-04-23 10:39:25 +02:00
Techlone
e24cd9e732
fix #1029
2017-04-22 16:10:21 +05:00
Dream-Master
f5e078aa1e
fix derp
2017-04-18 00:00:03 +02:00
Dream-Master
8d539f2e54
change Energy Crystal recipe a bit.
2017-04-17 23:02:55 +02:00
Johannes Gäßler
9af7f8cc67
Made Diesel Engine Tooltip more descriptive
2017-04-16 10:33:36 +02:00
Johannes Gäßler
162d021fc8
Tooltip information on pollution is now dynamic, adjusted GT_Pollution
...
documentation
2017-04-15 19:39:34 +02:00
Johannes Gäßler
d79721085e
Tooltips have more info on Steam and pollution, adjusted pollution rates
...
Boilers tooltips now explicitly state the amount of Steam produced per
second.
Gas Turbine tooltips now explicitly state how much steam is needed for
them to run at full capacity.
Machine tooltips now explicitly state how much Pollution they produce
per second.
Adjusted machine pollution values to have them align better.
Diesel Generators / Engines now go 40, 80, 160, 320
Gas Turbines now go 20, 40, 80, 160
Large Boiler tooltips now mention the amount of time needed to heat up
Formatted the source code for the Cleanroom
Fixed a bug that caused Diesel Generators and Gas Turbines to not have a
tooltip.
2017-04-15 19:05:57 +02:00
Johannes Gäßler
234c51ac20
Machine descriptions are now a String array instead of a single String.
...
The field mDescription of the class GT_MetaTileEntity_TieredMachineBlock
was turned into an array.
Every class derived from GT_MetaTileEntity_TieredMachineBlock has
received a new additional constructor that takes an array of Strings
instead of a single one.
2017-04-14 23:33:20 +02:00
Johannes Gäßler
213d5bb9df
Large Boiler fuel burn rate now configurable
...
By placing an integrated circuit in the Large Boiler it is now possible
to adjust fuel burn rate and steam output at no change in efficiency.
The steam output of a boiler is reduced by 1000L per configuration.
2017-04-14 20:03:29 +02:00
Johannes Gäßler
7044deb43b
Added a recipe for Thaumcraft Alumentum and some other items
...
Iterating over items and checking for fuel values turned out to not give
good results because it ignores the Ore Dictionary.
For instance there would be a page for only oak logs instead of a page
with wood in general.
2017-04-13 23:21:35 +02:00
Johannes Gäßler
2064e0b12c
Explicitly added some Solid Fuels to the Large Boiler Fuel tab.
...
I was unable to automatically add all fuels to the tab.
2017-04-11 00:47:56 +02:00
Johannes Gäßler
822cf1ec3e
Expanded the NEI api to allow for custom descriptions, added liquid
...
fuels to the newly created Large Boiler tab
Instead of the default information like total EU or EU usage it is now
possible to provide custom Strings to describe a recipe.
The Large Boiler NEI tab explicitly shows burn times for fuels depending
on the boiler used.
Any liquid fuel added to Diesel Fuels or Semifluid Fuels will
automatically be added to Large Boiler Fuels.
2017-04-10 20:57:44 +02:00
Blood-Asp
ee5af6ac40
Fixing names for plastics
2017-04-10 13:07:13 +02:00
Blood-Asp
706d2e4bd5
All foils can be made in bender.
2017-04-10 12:54:11 +02:00
Blood-Asp
13043923c0
Fix compile issue
2017-04-10 12:47:50 +02:00
Technus
08036ff192
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-04-07 01:58:15 +02:00
Technus
4bfb425096
Should fix one bug case on transformers?
2017-04-07 01:57:52 +02:00
Dream-Master
8470f9dd45
make good circuits a bit cheaper
2017-04-04 22:47:31 +02:00
Dream-Master
e8a332aa76
Good Circuits recipes are to cheap. Will add the change into Quests.
2017-04-04 17:00:11 +02:00
Archengius
8081ba10df
Remove deprecated api..
2017-04-03 16:37:25 +07:00
Technus
c7f8240336
I think that would be required also... Fusion fix
2017-04-03 09:16:24 +02:00
Technus
68f5479199
Fusion fix
2017-04-03 09:07:44 +02:00
Blood-Asp
9edf005c3c
Regulator fix
2017-04-03 08:47:41 +02:00
Technus
bde230b96d
Apply amperage correctly in proc arrays
2017-04-03 08:44:36 +02:00
Blood-Asp
454b255f1b
Fix regulator crash bug
2017-04-01 12:26:47 +02:00
Technus
1c7787e535
Neutronium should had no plasma anyways... (prepairing ground for EM)
2017-04-01 09:51:15 +02:00
Blood-Asp
f94ae649be
Move some recipes since max java method size was reached
2017-04-01 01:25:30 +02:00
Blood-Asp
6f5e16b286
Updated Achievements to fit changed circuits
2017-04-01 01:03:52 +02:00
Blood-Asp
998709430c
Fix typo
2017-03-31 22:37:51 +02:00
Blood-Asp
7beabd163a
catch most modular armor crashes
2017-03-31 22:24:36 +02:00
Blood-Asp
d41d3cd2b3
Add assemblyrecipes for all circuits per oredict
2017-03-31 22:24:15 +02:00
Blood-Asp
b5626433b9
Better logging for oregen
2017-03-31 21:27:50 +02:00
Blood-Asp
f030951982
Config for blocks below crops
2017-03-31 21:19:04 +02:00
Blood-Asp
32a21a0ac1
Remove testline
2017-03-31 19:02:45 +02:00
Blood-Asp
dd8510792f
Detect low grav dimensions by world provider
2017-03-31 19:01:32 +02:00
