Commit graph

106 commits

Author SHA1 Message Date
Blood-Asp
dbbefafbcc
Merge branch 'unstable' into GT6-styled_pipes 2017-11-25 18:43:13 +01:00
JohannesGaessler
b87a55800f Removed NEI Large boiler fuel entry for Carbon Dust (#1295)
Fixes #1285. Invalid Burn value on Carbon dust in NEI page for Large Boiler Fuels.
2017-11-22 05:54:14 +10:00
Blood-Asp
2a466bb76e
Merge pull request #1267 from redmage17/unstable
Configed Storage Blocks
2017-11-05 18:07:53 +01:00
redmage17
45a2057b69 Configed Storage Blocks
Added config for removal of shapless recipes for storage blocks
2017-11-01 10:43:34 -04:00
Antifluxfield
78aa11bd38 Another config to control wire connections, and disable them by default. 2017-10-30 19:17:00 +08:00
Antifluxfield
f96993bd33 Soldering Tools for cable connection 2017-10-30 10:03:28 +08:00
Antifluxfield
22c2f16509 GT6 styled pipe and wire connection 2017-10-30 09:18:40 +08:00
Antifluxfield
32cea58782 l10n improve 2017-10-19 10:30:37 +08:00
Blood-Asp
5e38000ccc Add config for AE2Tunnel. Defaul off for now until fix. 2017-09-13 22:50:46 +02:00
Blood-Asp
51a4389f7c Hard remove ores that might be exploitable by MRF laser drill 2017-09-12 22:53:02 +02:00
Blood-Asp
7a4795f7af Merge pull request #1200 from Dimach/unstable-11
Patched ME energy tunnel, now they can emit GT energy.
2017-09-12 21:09:50 +02:00
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +02:00
Dimach
ded594c86c Patched ME energy tunnel, now they can emit GT energy. 2017-08-27 01:55:20 +03:00
Johannes Gäßler
c281488927 Merge branch 'unstable' into PyrometallurgyUpdate
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 23:46:31 +02:00
Johannes Gäßler
af8860be2f Merge remote-tracking branch 'origin/unstable' into
CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 14:24:52 +02:00
Johannes Gäßler
1b5047df4f Old chemical recipes are now enabled by default, marked as deprecated 2017-08-19 10:43:07 +02:00
Muramasa-
8b85da877d implements #1061 2017-08-11 22:52:51 +01:00
Blood-Asp
9962e826a7 Merge pull request #1159 from JohannesGaessler/AshRebalance
Ash rebalance
2017-08-11 15:16:16 +02:00
Johannes Gäßler
d563a92dbc Moved Synthetic Rubber requirement: EV -> IV, made it more convenient
Cable insulation works as it did before for EV cables.
IV+ Cables can be insulated with only molten Silicone.
Insulation now also works with whole Dusts at 4x the batch size.
2017-08-01 16:08:15 +02:00
Johannes Gäßler
1763f60b36 Added a config for the converion rate of Direct Smelting: 1 <-> 2/3 2017-07-26 23:26:17 +02:00
Johannes Gäßler
184774c7f1 Added config options for old ash recipes, tweaking ash output 2017-07-16 12:14:49 +02:00
Johannes Gäßler
f7e33fd402 Capped the output multiplier of stone dust to 100%. 2017-07-15 00:49:50 +02:00
Johannes Gäßler
3253175e5f Rebalanced Stone Dust centrifugation 2017-07-14 23:13:45 +02:00
Johannes Gäßler
5d8bcb0af3 Added a method for calculating total version ID 2017-07-02 01:02:55 +02:00
Johannes Gäßler
a6046ddfad Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
I added a new method to BaseMetaTileEntity that shifts the Inventory
index according to the change in Input/Output slots.

Instrumentally I have added a new version ID that considers the GT
subversion.
2017-07-02 00:09:48 +02:00
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25 23:45:45 +02:00
Johannes Gäßler
6f3d92f3fa Added a config option for easier EV+ Cables 2017-06-24 11:56:35 +02:00
Johannes Gäßler
c0c498fb8c Added Bricked BF config, fixed Primitive BF class hierarchy
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
2017-06-23 23:48:38 +02:00
Johannes Gäßler
34474480f7 Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
Conflicts:
	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/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15 12:28:14 +02:00
Draknyte1
d1eea59fe7 Made the Cleanroom optional.
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14 18:55:26 +10:00
Blood-Asp
ead3fa6ad7 meh... 2017-06-13 18:57:05 +02:00
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +02:00
Blood-Asp
b418fede09 Change Automaintain default 2017-05-31 18:59:32 +02:00
Yuriy Shnitkovskiy
c0f8bafc60 I guess I wanted to put it here for some reason 2017-05-16 19:52:04 +03:00
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03:00
Johannes Gäßler
978c4877b6 Added molecular formulas for the new materials, added alternative
charcoal recipes.

Charcoal can now be made by treating Wood Pulp or Sugar with Sulfuric
Acid (takes very long, doesn't scale well)
2017-05-01 22:02:36 +02:00
Johannes Gäßler
a0bf545451 Added config for simple chemical recipes and stone dust centifugation 2017-05-01 14:36:50 +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
Blood-Asp
13043923c0 Fix compile issue 2017-04-10 12:47:50 +02:00
Archengius
8081ba10df Remove deprecated api.. 2017-04-03 16:37:25 +07:00
Blood-Asp
f030951982 Config for blocks below crops 2017-03-31 21:19:04 +02:00
Blood-Asp
dd8510792f Detect low grav dimensions by world provider 2017-03-31 19:01:32 +02:00
Techlone
556fa42c37 fix adv circuit 2017-03-12 23:45:12 +05:00
Blood-Asp
f12964c716 Remove rubber from steamage 2017-03-01 13:36:27 +01:00
Blood-Asp
c1c174b76c Recipe balancings 2017-02-28 23:27:36 +01:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
Maxime Legkiy
8e2280bc2c Fix name config category to UndergroundFluid
Fix comments configuration
Fix Start config - add nether and end to BlackList. Default spawn fluids on overworld and Moon.
Add Decrease Per Operation Amount (if 0 an endless source)
2017-02-17 01:55:54 +03:00
Maxime Legkiy
901a7d66c1 Add new flexible configuration undeground oil 2017-02-13 04:24:48 +03:00
Maxime Legkiy
772ec04bf3 Add Underground Oil Generating settings in GregTech.cfg
Add supports White and Black List (DIM ID)
Add settings generating for standart Dimension and Galacticraft Dimension - Moon and Mars
Add settings for select type Underground Fluid - for Nether default Pahoehoe Lava, for Moon - Helium 3
Add settings max Amount Generating
For generating oil in other Dimension (Twilight Forest or Mystcraft) use settings - RealDimensionEnable
2017-02-09 05:38:20 +03:00