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

743 commits

Author SHA1 Message Date
Antifluxfield
8faba6a054 Improve i18n of tooltip 2017-09-15 01:25:50 +08:00
Blood-Asp
5e38000ccc Add config for AE2Tunnel. Defaul off for now until fix. 2017-09-13 22:50:46 +02:00
Technus
af5b360508 more descriptive argument name 2017-09-13 21:35:44 +02:00
Technus
d111a4f130 Optimize a bit 2017-09-13 21:34:06 +02:00
Technus
339494f8c3 cherrypick 2017-09-13 21:33:41 +02:00
Technus
264236f98f Minor change, can catch potential errors when the extraction val per tick is insane 2017-09-13 21:27:52 +02:00
Blood-Asp
ed2a421568 tooltip again 2017-09-13 01:11:45 +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
34ee89fc4b Fix Tooltip 2017-09-12 22:48:41 +02:00
Blood-Asp
d61f8ed6f1 Fix #1201 2017-09-12 21:33:06 +02:00
Blood-Asp
b78a31edb4 Merge fix 2017-09-12 21:26:36 +02:00
Blood-Asp
58a8eb5b6b Merge pull request #1211 from Antifluxfield/patch-2 
Fix localization of Item Distributor
 2017-09-12 21:20:58 +02:00
Blood-Asp
9ece29b94e Merge branch 'unstable' into odp_speed_improving 2017-09-12 21:20:13 +02:00
Blood-Asp
73c197ff25 Merge branch 'unstable' into drillers-upgrade 2017-09-12 21:04:33 +02:00
Antifluxfield
69d557908f Fix l10n of Item Distributor 2017-09-11 11:23:53 +08: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
John
2127e4950d missclick 2017-09-10 21:45:32 +05:00
Techlone
dae15665cc Now ODP Mk(N) is faster than Mk(N-1) 2017-09-10 21:41:33 +05:00
Antifluxfield
9cbb9c66a2 Fix logic when working in void dimensions 2017-09-04 00:09:13 +08:00
Blood-Asp
6df7f36bd9 Merge branch 'unstable' into CircuitChemistryUpdateFollowup 2017-09-03 17:57:34 +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
edba8167b6 Merge branch 'unstable' into patch-5 2017-09-03 14:55:30 +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
0819ea5da7 Merge pull request #1191 from Antifluxfield/patch-2 
Fix the Tooltip of Pumps
 2017-09-03 14:44:01 +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
01da9150f6 Added missing Tetraitromethane, Polymerization recipes 2017-08-24 09:58:14 +02:00
Antifluxfield
eb749f64ca Use "/n " as seperator 2017-08-21 21:38:39 +08: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
Antifluxfield
d5b0dcfa50 Multi-line tooltip of #1193 2017-08-21 09:59:47 +08: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
967c3c07af Reduced Oxygen consumption of Plastic Production by 50% 2017-08-19 13:32:09 +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
Antifluxfield
6691f1e86c Update GT_Cover_FluidRegulator.java 
Improve the screwdriver-rightclick behavior.
 2017-08-17 14:51:45 +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
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
Muramasa-
9fc5d17eb5 Pump tooltips 2017-08-12 02:21:09 +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