Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1539 commits 8 branches 203 tags 97 MiB
Commit graph

1313 commits

Author SHA1 Message Date
Blood-Asp
ec1460d2da Merge pull request #1184 from GTNewHorizons/texture_overhaul 
Texture overhaul
 2017-09-03 15:54:24 +02:00
Blood-Asp
a377bcea63 Merge pull request #1170 from JohannesGaessler/PyrometallurgyUpdate 
Pyrometallurgy update
 2017-09-03 15:46:19 +02:00
Blood-Asp
edba8167b6 Merge branch 'unstable' into patch-5 2017-09-03 14:55:30 +02:00
Blood-Asp
4f73a6b726 Merge pull request #1197 from JohannesGaessler/FluidCannerCostReduction 
Fluid Canner cost reduction
 2017-09-03 14:50:26 +02:00
Blood-Asp
30daf05176 Merge pull request #1195 from Techlone/fix_inconsistent_wordgen 
Fix inconsistent worldgen
 2017-09-03 14:49:29 +02:00
Blood-Asp
471ed5c9ea Merge pull request #1193 from Antifluxfield/patch-4 
Improve fluid regulator
 2017-09-03 14:45:38 +02:00
Blood-Asp
21bb9c8c8d Merge pull request #1192 from Antifluxfield/patch-3 
Fix the Generated Item Pipes
 2017-09-03 14:44:40 +02:00
Blood-Asp
0819ea5da7 Merge pull request #1191 from Antifluxfield/patch-2 
Fix the Tooltip of Pumps
 2017-09-03 14:44:01 +02:00
Blood-Asp
dc2a6073f0 Merge pull request #1174 from Dimach/unstable-3 
Added new function to GT scanner
 2017-09-03 14:43:42 +02:00
Blood-Asp
ef4a2d48a6 Merge pull request #1168 from Antifluxfield/patch-1 
Correct description of regulator
 2017-09-03 14:40:19 +02:00
Blood-Asp
2555acf75f Merge pull request #1147 from SLiMylya/addnewbattery 
Add new zpm and uv battery
 2017-09-03 14:38:59 +02:00
Johannes Gäßler
5e87d49f29 Fixed wrong IC2 Biogas energy density due to GT optimization 2017-09-01 21:07:31 +02:00
Johannes Gäßler
e965c09aab Revised Biomass Distillation Tower recipes in terms of EU density 2017-09-01 20:41:38 +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
3165853e4f Fixed a bug where the energy density of Biogas was calculated wrongly 2017-08-25 09:35:26 +02:00
Johannes Gäßler
0189b933e3 Revised Hydrochloric Acid recycling, Salt electrolyzation cost 
Hydrochloric Acid can be recycled at 100% efficiency.
The production of Dimethylhydrazine, Tetrafluoroethylene,
Polydimethylsiloxane, and Hypochlorous Acid yields Diluted Hydrochloric
Acid, which can be recycled at 50% efficiency.

The energy cost of 21600 EU per 2 Salt -> Sodium + Chlorine has turned
out to be too high.
The cost is now 9600 EU.
 2017-08-25 09:19:19 +02:00
Johannes Gäßler
01da9150f6 Added missing Tetraitromethane, Polymerization recipes 2017-08-24 09:58:14 +02:00
Johannes Gäßler
b5721d140b Fixed Nitric Oxide EUt, halved Ammonia cost 
To prevent the construction of perpetua mobilia via Rocket Fuel the EU
cost of making Dimethylhydrazine has been increased.
 2017-08-23 21:00:25 +02:00
Johannes Gäßler
8f2a365b78 Fixed inconsistent SMD capacitor recipes 2017-08-21 16:13:28 +02:00
Antifluxfield
eb749f64ca Use "/n " as seperator 2017-08-21 21:38:39 +08:00
Antifluxfield
f6482e63ae Use "/n " as seperator 2017-08-21 21:28:37 +08:00
Johannes Gäßler
2629510683 Fixed collision between Acetic Acid and Vinyl Chloride recipes 2017-08-21 14:23:51 +02:00
Johannes Gäßler
4eafe33685 Added Assembler recipes for Small Coils, can use Annealed Copper 2017-08-21 10:03:05 +02:00
Johannes Gäßler
57dbb05068 Added scalable Methane + Water -> Hydrogen + CarbonDioxide recipes 2017-08-21 09:29:16 +02:00
Johannes Gäßler
c2e4ebea6e Fixed EV Pumps using the wrong Rubber 2017-08-21 09:05:08 +02:00
Johannes Gäßler
f94d61a3d2 Fixed Large Chemical Reactor GUI, was wrongly using default before 2017-08-21 08:56:24 +02:00
Johannes Gäßler
97fc717f9a Fixed LCM desulfurization recipes in combination with CirChemUpdateFU 2017-08-21 08:42:24 +02:00
Antifluxfield
d5b0dcfa50 Multi-line tooltip of #1193 2017-08-21 09:59:47 +08:00
Antifluxfield
78e03914a3 Improve tooltip 
Now the metaitems can automatically seperate its tooltip to multiple lines with "////".
 2017-08-21 09:56:04 +08:00
Johannes Gäßler
bc58367801 Added missing Tetrafluoroethylene recipes 2017-08-20 17:54:57 +02:00
Johannes Gäßler
3edd505c7e All SMD Components now use Plastic, MV 2017-08-20 11:58:19 +02:00
Johannes Gäßler
3b39210348 Fixed desulfuriation recipes colliding with hydro-cracking recipes 2017-08-20 10:15:25 +02:00
Johannes Gäßler
1c8df8fb7f Fixed Titaniumtetrachloride temperature 2017-08-19 23:56:48 +02: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
d85b7bee49 Fixed Chloroform recipe 2017-08-19 23:36:10 +02:00
Johannes Gäßler
1afc8405e8 Added multi-step recipes for the Large Chemical Reactor 
Added recipes for the Large Chemical Reactor that perform several steps
of a processing line in a single recipe.
 2017-08-19 23:32:39 +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
967c3c07af Reduced Oxygen consumption of Plastic Production by 50% 2017-08-19 13:32:09 +02:00
Johannes Gäßler
d294ba9773 Reduced the cost of Fluid Canners 
Circuits: 2 -> 1
Pumps: 2 -> 1
Glass: 2 -> 4
 2017-08-19 11:46:52 +02:00
Johannes Gäßler
e8c75a54ee Fixed Steam Macerators using constant EUt, recipe time 2017-08-19 11:32:29 +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
Antifluxfield
4724bbe403 Adding tooltip 2017-08-19 12:08:34 +08:00
Techlone
ec0767d4fd Fix inconsistent worldgen 2017-08-19 03:17:14 +05:00
Johannes Gäßler
54437dc8f1 Greatly increased IC2 Biomass consumption, added scaleable FB recipes 
Previously the energy density of IC2 Biomass was very high.
1000L of IC2 biomass could be converted into 32000L of IC2 Biogas in the
Distillery or into 64000L of IC2 Biogas in the Distillation Tower.

With an IC2 Canning Machine and a Distillery you got 128000 EU from 1
Potato.
With a Pyrolyse Oven and a Distillation Tower you got 320000 EU from 1
Potato.

With the increased consumption rates (x16/x32) of Biomass the energy
Density has been greatly reduced.
1 Potato now yields 8000 EU with an IC2 Canning Machine and 12000 EU
with a Pyrolyse Oven.

Also, scaleable Recipes for Fermented Biomass has been added.
It is now possible to produce Fermented Biomass in the Pyrolyse Oven
without the need of any Fermenters.
 2017-08-18 09:24:02 +02:00
Johannes Gäßler
1e4f093966 Reenabled several old recipes regardless of the config 
-IC2 Biomass -> IC2 Biogas
-Forestry Biomass -> Ethanol
-LPG -> Super Fuel
-Food --Centrifuge--> Methane
-Heavy Fuel/Light Fuel --Distillery--> Toluene
 2017-08-18 08:41:13 +02:00
Muramasa-
87cdb8ac00 Fix use of RedstoneAlloy resulting in broken recipe 2017-08-17 23:28:31 +01:00
Antifluxfield
6691f1e86c Update GT_Cover_FluidRegulator.java 
Improve the screwdriver-rightclick behavior.
 2017-08-17 14:51:45 +08:00
Antifluxfield
505a9c263e Update GT_MetaTileEntity_MultiBlockBase.java 2017-08-16 17:51:12 +08:00
Antifluxfield
4b36ca77be Fix the Generated Item Pipes 
Correct the factor.
 2017-08-16 16:23:08 +08:00
Antifluxfield
a0eb30d03f Clean up imports 2017-08-16 14:00:52 +08:00
Antifluxfield
ae5a1e117d Move the Data-Access codes only to those who really needs them. 2017-08-16 13:35:45 +08:00
Antifluxfield
c09f6b5bdd Fix Tooltip of Pump 
Add the missing bracket
 2017-08-16 13:14:23 +08:00
Johannes Gäßler
75a528d825 Added Ass. recipes for Electronic Circuit components, reduced GT time 
The following components can now be made in an Assembling Machine:
-Coated Circuit Board (-62.5% Sticky Resin cost)
-Vacuum Tube (-33% Copper/Paper cost)
-Phenolic Circuit Board (-20% Glue/Bisphenol A cost)

The time needed to make Glass Tube in the Alloy Smelter has been
reduced: 12s -> 8s
 2017-08-13 11:51:45 +02:00
Johannes Gäßler
a184258c98 Reverted the changes to basic machine processing. 
Basic Machines no longer automatically add an integrated circuit to
their input.
 2017-08-13 09:08:24 +02:00
Technus
8eade43a19 Fix NPE, GREG why u no crash game! 2017-08-12 15:08:25 +02:00
Muramasa-
9fc5d17eb5 Pump tooltips 2017-08-12 02:21:09 +01:00
Muramasa-
14a7d0768f Show dim id with scanner 2017-08-11 23:04:33 +01:00
Muramasa-
8b85da877d implements #1061 2017-08-11 22:52:51 +01:00
Muramasa-
eb24bee24b Some tooltip info #1183 2017-08-11 22:08:49 +01:00
Muramasa-
d58cece573 maybe correct #1137 2017-08-11 21:19:55 +01:00
Blood-Asp
a7c5d30146 Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterials 
More Item Pipe Materials
 2017-08-11 21:24:48 +02:00
Blood-Asp
d4ea25e1bc Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScaling 
Pyrolyse oven coil scaling
 2017-08-11 21:20:08 +02:00
Blood-Asp
ff7396509b Merge pull request #1176 from Dimach/unstable-4 
Added new info to batbuffer nuclear control panel and fixed bug
 2017-08-11 21:14:08 +02:00
Blood-Asp
1b1f96dcd9 Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowup 
Cracking Balance Followup
 2017-08-11 15:18:10 +02:00
Blood-Asp
9962e826a7 Merge pull request #1159 from JohannesGaessler/AshRebalance 
Ash rebalance
 2017-08-11 15:16:16 +02:00
Blood-Asp
42094fdf46 Merge pull request #1158 from JohannesGaessler/StoneDustRebalance 
Stone Dust Rebalance
 2017-08-11 15:07:05 +02:00
Blood-Asp
2c50b0a825 Merge pull request #1157 from Dimach/unstable-1 
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
 2017-08-11 14:54:23 +02:00
Blood-Asp
c0da1931dd Merge pull request #1156 from Antifluxfield/distillery-recipe-fix-alt 
Another Distillery recipe fix
 2017-08-11 14:33:27 +02:00
Blood-Asp
4ae02f55c8 Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFix 
Multiblock Fluid IO fix
 2017-08-11 14:24:37 +02:00
Blood-Asp
987d1ec11e Merge pull request #1149 from joakibj/fix-orebasalticmineralsand 
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
 2017-08-11 14:21:03 +02:00
Blood-Asp
46420e73cb Merge pull request #1144 from Dimach/unstable 
Fixed coloring of pyrolyse oven.
 2017-08-11 14:19:10 +02:00
Johannes Gäßler
a749a8536f Reverted changes to Mercury Ore Washing. 2017-08-07 23:12:27 +02:00
Johannes Gäßler
c2ededaf5a Made the tooltips for Multiblock Hatches more descriptive. 2017-08-07 22:00:26 +02:00
Johannes Gäßler
f3d3cc24de Fixed a bug where the Nugget amount did not scale with the config 2017-08-07 21:20:43 +02:00
Johannes Gäßler
4822c5ca28 Reverted the Galena formula: PbS -> Pb3Ag3S2 2017-08-07 21:06:41 +02:00
Johannes Gäßler
e4fff57b04 Reverted the change that gated Plastic at MV. It's available at LV again 2017-08-07 20:56:22 +02:00
Johannes Gäßler
3b7a016408 Replaced Tin with Wrought Iron as Item Pipe Material 2017-08-07 20:50:41 +02:00
Johannes Gäßler
a7787342b1 Fluid can now also be locked via cells, added a chat message 2017-08-06 12:05:08 +02:00
Johannes Gäßler
a63730107b Implemented NBT for the Locked Fluid 2017-08-06 09:41:44 +02:00
Johannes Gäßler
cbcb04d117 Output Hatches can now be locked to a specific fluid 
Currently not working as intended
 2017-08-06 09:36:05 +02:00
Johannes Gäßler
9bd9d7d5e0 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-06 09:36:02 +02:00
Johannes Gäßler
2e849a4ec8 Fixed a bug where a recipe had the wrong amount of Cells 2017-08-06 09:35:59 +02:00
Johannes Gäßler
469e65014e Fixed accidental change to the Cumene recipes due to not pulling 2017-08-06 09:35:56 +02:00
Johannes Gäßler
19817f2a26 Fixed Salt processing recipes 
SaltWater now yields the same amount of material as Salt Dust.
Increased the energy cost of electrolyzing Salt to make netto energy
yield via NaOH+Hydrogen negative.
 2017-08-06 09:35:53 +02:00
Antifluxfield
8a2d88c157 Fix imbalanced recipe 2017-08-06 09:35:50 +02:00
Johannes Gäßler
74529795fb Removed Burn Value for Carbon Dust. 2017-08-06 09:35:47 +02:00
Johannes Gäßler
2ddf1d19ad Added the Large Chemical Reactor Controller inventory to the item input 2017-08-06 09:35:44 +02:00
Johannes Gäßler
818c9a55a8 Fixed a bug where Brick, Clay, and Fireclay had the wrong texture sets. 
The above materials originally had the ROUGH texture. I tested what they
would look like with the DULL texture and I forgot to revert it
afterwards.
 2017-08-06 09:35:40 +02:00
Johannes Gäßler
0ddc793c9d Enabled Coal/Charcoal/Coal Coke Blocks for the Primitive Blast Furnace 2017-08-05 23:22:45 +02:00
Johannes Gäßler
1751ec494c Just in case the number goes negative 2017-08-05 08:43:14 +02:00
Daniel
c9ea7f7727 Update commentary 2017-08-04 23:02:16 +02:00
Technus
fc08b67f7d Fix rare case of texture not updating when: 
Changing texture from page x to page 0 without changing the texture id
 2017-08-04 22:03:59 +02:00
Johannes Gäßler
cd4ca84e80 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-04 10:47:54 +02:00
Technus
bf4f19557a Fix one missing spot in deprecated api. 
(for texture change use that is)
 2017-08-03 23:15:52 +02:00
Daniel
c0b1f74e08 Minor error correction 
We have 16 tiers of textures.
 2017-08-03 22:54:36 +02:00
Technus
94ed98cbbd More compatible attempt 2017-08-03 22:52:56 +02:00
Johannes Gäßler
3b976f4aea Multiblock Chemical Reactor now also automatically adds an Int. Circ. 2017-08-02 22:24:53 +02:00
Johannes Gäßler
ee7f576abf Reenabled regular Rubber for the EV Conveyor Belt 2017-08-02 22:15:30 +02:00
Technus
85479e1779 Add pages to array 2017-08-02 19:10:54 +02:00
Technus
281254348e Expand to add proper texture paging support. 2017-08-02 19:08:45 +02:00