Commit graph

2139 commits

Author SHA1 Message Date
Technus
92b968f135 Merge branch 'experimental' into eM 2017-01-09 23:05:55 +01:00
Technus
02d872331c Move achievements 2017-01-09 23:05:37 +01:00
Technus
7b11e084ae Move achievements 2017-01-09 23:04:45 +01:00
Dream-Master
d7af401006 fix #965
Blood infused iron plates for glass dagger of sacrafice cant be crafted
2017-01-08 19:27:10 +01:00
Blood-Asp
8cb644066b Merge pull request #845 from KpoxaPy/issue-829
Fix #829 — Wrong output range in Tooltips
2017-01-06 16:16:01 +01:00
Technus
6a6be411ac Merge branch 'experimental' into eM 2017-01-05 21:45:33 +01:00
Dream-Master
a7fd436bc4 centrifuge recipe from infused gold change 2017-01-05 21:20:44 +01:00
Dream-Master
07eb3b42cf remove unused imports. 2017-01-05 20:50:56 +01:00
Dream-Master
facd22b08e bump version 2017-01-05 20:04:32 +01:00
Dream-Master
28d1b089b3 add centrifuge recipe for infused gold add salis mundus 2017-01-05 20:04:15 +01:00
Dream-Master
e95ec79a0f bump version 2017-01-05 19:20:54 +01:00
Technus
93c03e2f61 Merge branch 'experimental' into eM 2017-01-05 18:38:43 +01:00
KpoxaPy
5e7035c8bb Port advanced seismic prospector. 2017-01-05 18:38:25 +01:00
David Vierra
648b4c9562 Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2017-01-05 18:38:19 +01:00
KpoxaPy
59b2baf3b8 Port advanced seismic prospector. 2017-01-05 18:36:51 +01:00
David Vierra
086a590c53 Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2017-01-05 18:07:30 +01:00
Technus
6cfe809d4b Merge branch 'experimental' into eM
# Conflicts:
#	libs/GTNewHorizonsCoreMod-1.7.10-1.3.02.jar
2017-01-05 17:59:04 +01:00
KpoxaPy
d64c5b2106 Update large turbines output tooltip Blood-Asp/GT5-Unofficial#829 issue 2017-01-05 15:04:15 +03:00
Blood-Asp
3b2e1a50aa Merge pull request #842 from KpoxaPy/feature-adv-prospector
Add advanced seismic prospector
2017-01-05 12:05:41 +01:00
KpoxaPy
4aa8fd45c4 Add advanced seismic prospector 2017-01-05 02:45:01 +03:00
Blood-Asp
b794aac1d0 Merge pull request #827 from KpoxaPy/unstable
Fix #825
2017-01-04 16:42:25 +01:00
Blood-Asp
868fe1f77d Merge pull request #833 from codewarrior0/patch-1
Fix #830 - Maint Cover does not emit if rotor needs maint
2017-01-04 16:36:04 +01:00
Blood-Asp
b7d187cc4e Merge pull request #836 from codewarrior0/issue-720-cme
Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization
2017-01-04 16:35:52 +01:00
Andrew Ozmitel
e7e48ff215 Merge remote-tracking branch 'upstream/unstable' into unstable 2017-01-04 15:16:31 +03:00
Dream-Master
8dbbf23f48 Diesel get a new burn value
Light fuel is 256 heavy fuel 192
2017-01-04 08:56:46 +01:00
Dream-Master
64afb0f43b no message 2017-01-03 19:10:40 +01:00
Dream-Master
d28f4f5798 Change Distillation Tower to hv 2017-01-03 19:08:11 +01:00
Dream-Master
355f419f41 change 32 eu to 30 2017-01-03 06:52:51 +01:00
Dream-Master
3c88675e72 bump version 2017-01-02 16:01:52 +01:00
Dream-Master
8cbb366360 Concurrency error in GT_LanguageManager.addStringLocalization
fixed by @codewarrior0
2017-01-02 16:01:33 +01:00
David Vierra
50b9fc9238 Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization 2017-01-01 21:57:31 -10:00
Dream-Master
d39553eef0 add new core mod version 2017-01-01 07:29:58 +01:00
Dream-Master
1401da55cd remove old devs 2017-01-01 07:28:17 +01:00
Dream-Master
c5dd26ec43 bump version 2017-01-01 07:11:28 +01:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00
David Vierra
75acc1d3eb Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2016-12-30 23:57:40 -10:00
Technus
c1da08e750 remove todo 2016-12-30 11:21:43 +01:00
Technus
49d2982094 remove todo 2016-12-30 11:21:06 +01:00
Andrew Ozmitel
674a2aec83 Fix Blood-Asp/GT5-Unofficial#825 2016-12-28 20:03:05 +03:00
Muramasa-
c69a768640 Fix missing Computronics components 2016-12-27 22:42:02 +00:00
Muramasa-
7e3d4ccf4a Port LightningRod (To be changed by Bloody) & Character fix 2016-12-27 21:08:16 +00:00
Muramasa-
58e2886012 Fix ToolHead processors 2016-12-27 20:49:28 +00:00
Blood-Asp
94cdcfe33c Fix fluid naquadah generator not consuming fuel 2016-12-27 12:14:40 +01:00
Blood-Asp
0c56122e35 Fix Chlorine recipes 2016-12-27 10:41:49 +01:00
Technus
d6691d4cff fix coilage 2016-12-26 21:43:45 +01:00
Technus
cc8f219f9b fix coilage 2016-12-26 21:43:16 +01:00
Technus
2f51bf22c2 we dont have it 2016-12-26 15:48:42 +01:00
Technus
e5d9cd3ca1 we dont have it 2016-12-26 15:48:32 +01:00
Technus
6f52504283 Fix EBF coil buff 2016-12-26 15:45:10 +01:00
Blood-Asp
9e4d94724d Better furnacing with better coils. 2016-12-26 15:45:05 +01:00