Commit graph

1521 commits

Author SHA1 Message Date
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
4c82462138 Fix #1212 2017-09-13 01:12:50 +02:00
Blood-Asp
ed2a421568 tooltip again 2017-09-13 01:11:45 +02:00
Blood-Asp
75991a36cd Fix oil drill crafting recipes 2017-09-13 01:10:47 +02:00
Blood-Asp
2f8468eaf5 fix? 2017-09-12 23:19:09 +02:00
Blood-Asp
6a4e2dc890 Add onedrive download link 2017-09-12 23:17:00 +02:00
Blood-Asp
f11b10425b version number 2017-09-12 22:54:41 +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
c2fa20a2ce Rebalance Nitric Acid production cost vs usage 2017-09-12 21:59:53 +02:00
Blood-Asp
36eecf6196 Rebalance charcoal byproduct destillation 2017-09-12 21:55:40 +02:00
Blood-Asp
3f74245a5b Fix #1208 2017-09-12 21:52:31 +02:00
Blood-Asp
d61f8ed6f1 Fix #1201 2017-09-12 21:33:06 +02:00
Blood-Asp
419ce5496a Fix #1204 2017-09-12 21:26:52 +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
96dce6241e Merge pull request #1209 from Techlone/odp_speed_improving
Odp speed improving
2017-09-12 21:20:24 +02:00
Blood-Asp
9ece29b94e Merge branch 'unstable' into odp_speed_improving 2017-09-12 21:20:13 +02:00
Blood-Asp
88364a5ba1 Merge pull request #1203 from YoungGT/unstable
Update zh_CN.lang
2017-09-12 21:10:14 +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
0d0d8270ee Merge pull request #1163 from Antifluxfield/drillers-upgrade
Drillers upgrade
2017-09-12 21:09:32 +02:00
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
69d557908f Fix l10n of Item Distributor 2017-09-11 11:23:53 +08:00
Antifluxfield
bd305c45b0 Fix l10n of Item Distributor 2017-09-11 11:22:10 +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
YoungGT
c0ca3865b0 Update zh_CN.lang 2017-09-10 20:50:26 +08:00
YoungGT
a6fe06c7f5 Update zh_CN.lang 2017-09-10 20:46:02 +08:00
YoungGT
6eb089d42b Update zh_CN.lang 2017-09-10 20:41:46 +08:00
Dimach
c6d39f12fd Replaced protected fields access with methods calls, now code more safe. 2017-09-06 10:47:03 +03:00
YoungGT
2eac4d9fa2 Update zh_CN.lang 2017-09-05 06:47:13 +08:00
YoungGT
9c9d915d51 Update zh_CN.lang 2017-09-04 22:19:42 +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