Johannes Gäßler
1f83a98876
New recipes, convenience methods, recipe rebalancings
...
Implemented new recipes for Gunpowder, Saltpeter, Sulfuric Acid
Gave Sulfur dust a burn value (1600, the same as coal)
Made all chemical recipes stoichiometrically correct whenever possible
(2 H + 1 O -> 1 H2O instead of 2 H + 1 O -> 3 H2O)
Added a convenience method to Materials that lets you get dust
succinctly
Put all simplified recipe additions in a separate method, the config is
still missing
2017-04-30 18:04:25 +02:00
Dream-Master
8661cebf89
more changes circuits
2017-04-30 16:28:43 +02:00
Dream-Master
856b8946e5
more circuit changes
2017-04-30 16:18:40 +02:00
Dream-Master
0bfb05c7f7
This should work
2017-04-30 15:27:09 +02:00
Dream-Master
da11b91d56
try to add clean room recipes
2017-04-30 15:18:22 +02:00
Dream-Master
6f65d3ab87
fix circuit exploit
2017-04-30 11:42:59 +02:00
Dream-Master
14ae461281
rework circuits Basic and Good
2017-04-30 11:25:45 +02:00
Johannes Gäßler
8ac41d3c3c
Chem reactors can now output 2 items, implemented recipes for Nitric
...
Acid,added utility methods to get Material cells or integrated circuits,
it's now possible to declare a temperature for automatically created
fluids / gases
2017-04-30 01:36:10 +02:00
Dream-Master
15e92afd02
Added new Boards and new fluids
2017-04-30 00:51:46 +02:00
Johannes Gäßler
17bf0dd960
Fixed a sneaky and game-breaking bug that caused quite a lot of fluids
...
to no longer have recipes for filling cells.
The reason for the bug was that the bit flag 256 is already in use to
designate something as empty.
Since only bit flags up to 128 were documented I had unwittingly used
the 256 bit flag for fluid creation.
The documentation now informs about the function of 256.
Automatic fluid and gas creation are now controlled via booleans.
Big thanks to Techlone for helping me debug.
2017-04-29 17:23:19 +02:00
Dream-Master
e88cb7d796
remove gt circuit out of nc recipes
2017-04-29 11:01:00 +02:00
Dream-Master
5841db6733
derp
2017-04-28 23:59:12 +02:00
Dream-Master
aecff8261d
fix derp
2017-04-28 23:35:29 +02:00
Johannes Gäßler
bf414f1c99
Implemented Nitric Acid, Rocket Fuel
2017-04-28 23:34:39 +02:00
Dream-Master
7459d68818
fixed to jump from basic circuit to integrated circuit
2017-04-28 23:24:01 +02:00
Dream-Master
22f0af1b72
change circuits parts a bit.
2017-04-28 23:13:57 +02:00
Technus
1bafd2ad55
Runnable state achieved
2017-04-27 20:12:14 +02:00
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
Blood-Asp
77e1b53724
Merge pull request #1038 from Techlone/fix_assline_eu_production
...
Fix eu consumption absence by AssemblyLine and some clean up
2017-04-27 18:22:48 +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
Blood-Asp
07aa57e7de
Merge pull request #1032 from Techlone/fix_micro_recipies_1029
...
Fix micro recipies
2017-04-27 16:27:09 +02: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
610a064576
Expanded Charcoal Byproducts, added recipes that produce them
2017-04-24 23:07:26 +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
2674563827
Made the centrifuge recipes for ash more realistic
2017-04-24 20:33:33 +02:00
Johannes Gäßler
b5e0a5221c
Tweaked Titanium, implemented Silicone and Gunpowder
...
Carbon Monoxide can now be obtained as an optional byproduct from
Titaniumtetrachloride production.
Added a missing chemical reactor recipe for Gunpowder
2017-04-23 18:36:21 +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
Johannes Gäßler
1d93f77414
Added additional recipes for acids and bases
2017-04-23 10:03:38 +02:00
Johannes Gäßler
37eea39e29
Enabled solid output for Distilleries, implemented Epoxy Resin / PTFE
...
production
Expanded the GregTech API: There is now a convenience method for
automatically creating polymerization recipes.
Disabled recipes for the Salty Water Potion in favor of a new Salt Water
fluid.
Slightly nerfed Sulfuric Acid production from Sulfur and Water to make
them align with other acids and bases (1 Dust / 1000L Chemical + 1000L
Water -> 1000L acid/base)
2017-04-22 19:08:47 +02:00
Techlone
e24cd9e732
fix #1029
2017-04-22 16:10:21 +05:00
Johannes Gäßler
c6326a337c
Added recipes for Epichlorohydrin
2017-04-21 00:01:22 +02:00
Johannes Gäßler
72c55d5726
Refactored MaterialAdapter to MaterialBuilder to better represent the
...
class functionality.
2017-04-20 09:28:26 +02:00
Johannes Gäßler
9906c39720
Fixed a typo, Added a missing glue recipe
2017-04-20 00:29:26 +02:00
Johannes Gäßler
869cad0bba
Added a lot of (petro)chemistry stuff, expanded the API
...
Created an adapter class for creating materials.
Materials now have bit flags for automatic gas/fluid creation.
Added a new convenience method for adding distillery recipes.
Recipes now show the exact recipe duration instead of the duration
rounded down to the nearest int.
Added new Materials with relevant recipes:
Acetic Acid, Acetone, Calcium Acetate, Charcoal Byproducts, Carbon
Monoxide, Ethanol, Ethylene, Methanol, Methyl Acetate, Polyvinyl
Acetate, Propene, Sulfuric Ethylene, Vinyl Acetate
Made vinegar visible.
2017-04-19 23:36:50 +02: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
John
bd1ca056d6
Merge pull request #14 from Blood-Asp/unstable
...
Update
2017-04-16 02:18:17 +05:00
Johannes Gäßler
162d021fc8
Tooltip information on pollution is now dynamic, adjusted GT_Pollution
...
documentation
2017-04-15 19:39:34 +02:00
