Commit graph

1486 commits

Author SHA1 Message Date
Blood-Asp
73c197ff25 Merge branch 'unstable' into drillers-upgrade 2017-09-12 21:04:33 +02:00
Blood-Asp
8c46d09159 Merge pull request #1210 from Antifluxfield/patch-1
Fix #1206
2017-09-12 20:38:56 +02:00
Antifluxfield
bab71c5349 Fix NPE of fluid check 2017-09-11 10:49:47 +08:00
Antifluxfield
61d0582012 Fix NPE of fluid check. 2017-09-11 10:48:18 +08:00
Antifluxfield
9cbb9c66a2 Fix logic when working in void dimensions 2017-09-04 00:09:13 +08:00
Blood-Asp
0836e2f819 Merge pull request #1182 from JohannesGaessler/CircuitChemistryUpdateFollowup
Circuit/Chemistry Update follow-up
2017-09-03 17:57:51 +02:00
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +02:00
Blood-Asp
a6a7484138 Fix #1167 2017-09-03 17:10:27 +02:00
Blood-Asp
d0e3e9d68d Fix #1194 2017-09-03 16:09:25 +02:00
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
23cbb42266 Merge pull request #1199 from Antifluxfield/patch-5
Multi-lines tooltip support
2017-09-03 14:56:01 +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
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