Muramasa
|
491925bc59
|
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp
|
2016-09-16 12:06:01 +01:00 |
|
Muramasa
|
e981c0db30
|
One more conflict
|
2016-09-16 00:27:47 +01:00 |
|
Muramasa
|
6ac01a92c9
|
Fix conflicts
|
2016-09-16 00:17:08 +01:00 |
|
Blood-Asp
|
0e60389c41
|
Fix Tools and lag on reading tooltip
|
2016-09-15 22:02:18 +02:00 |
|
Muramasa
|
b22bb2dfa6
|
Update Part 1
|
2016-09-15 15:48:47 +01:00 |
|
Muramasa
|
b10acf8244
|
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp
|
2016-09-15 15:40:06 +01:00 |
|
Blood-Asp
|
c997df5952
|
Add Magneticraft compat
and remove Thaumcraft changes because of bugs/no improvements
And add config to arc smelt not annealed/wought.
|
2016-09-15 16:36:08 +02:00 |
|
Muramasa
|
1c195f5aab
|
Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes
|
2016-09-13 23:40:50 +01:00 |
|
Muramasa-
|
059cf34455
|
Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
|
2016-09-13 21:09:38 +01:00 |
|
Blood-Asp
|
4091b39401
|
Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental
|
2016-09-13 00:29:46 +02:00 |
|
Blood-Asp
|
a7c0bd518b
|
Gave away new bock ids.
|
2016-09-13 00:29:43 +02:00 |
|
Muramasa
|
75ef60a0c1
|
Add processing changes from LoadTimes/Bugfixes and more cleanup
|
2016-09-10 15:00:07 +01:00 |
|
Muramasa
|
33e6060119
|
Simplify, cleanup and seperate processors
|
2016-09-10 13:20:09 +01:00 |
|
Muramasa
|
f53fb2b84b
|
Bugfixes and now using built in OrePrefixes enabled/disabled lists
|
2016-09-09 14:25:59 +01:00 |
|
Blood-Asp
|
317a88b44a
|
Merge pull request #620 from Technus/patch-1
Fixing efficiency calculation operator precedence.
|
2016-09-03 12:28:14 +02:00 |
|
Daniel
|
735f76c649
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 12:18:17 +02:00 |
|
Daniel
|
b25332780a
|
Update GT_MetaTileEntity_LargeTurbine_Steam.java
|
2016-09-03 12:16:06 +02:00 |
|
Daniel
|
90b1f5b910
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 12:15:34 +02:00 |
|
Daniel
|
568aca1804
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 12:15:19 +02:00 |
|
Daniel
|
c52ff67fd6
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 12:15:02 +02:00 |
|
Daniel
|
734a290302
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 12:09:49 +02:00 |
|
Daniel
|
0c3a42aa7d
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 11:56:53 +02:00 |
|
Daniel
|
9b3d7149cf
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 11:50:05 +02:00 |
|
Daniel
|
4c60c1e41e
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 11:49:18 +02:00 |
|
Daniel
|
408a07ef24
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 11:42:53 +02:00 |
|
Blood-Asp
|
b4049e88a2
|
Port GT6 TC load time improvements
|
2016-08-31 14:22:00 +02:00 |
|
Muramasa
|
ac013d92c7
|
Actually, probably better to just exclude these
|
2016-08-31 04:57:16 +01:00 |
|
Muramasa
|
adca5141f9
|
fix issue with chest loot on server start
|
2016-08-31 04:47:54 +01:00 |
|
Muramasa
|
e1d777397f
|
Fix lens recipes & duplicate config list entries
|
2016-08-31 03:58:43 +01:00 |
|
Muramasa
|
415e683a43
|
Configurable components & fixes
|
2016-08-31 02:22:51 +01:00 |
|
Blood-Asp
|
8086832d88
|
tmp fix for #595
|
2016-08-25 17:28:19 +02:00 |
|
Blood-Asp
|
9f98bd589d
|
Merge pull request #605 from leagris/experimental
May or may not fix #565
|
2016-08-23 23:56:40 +02:00 |
|
Léa Gris
|
905f82a30f
|
Merge pull request #1 from leagris/leagris-patch-issue565
May or may not fix #565
|
2016-08-23 23:40:16 +02:00 |
|
Léa Gris
|
6401399e94
|
May or may not fix https://github.com/Blood-Asp/GT5-Unofficial/issues/565
Possibly fix issue #565 Assembly line books: item names not shown correctly on server
Possibly not the right way but it should do.
|
2016-08-23 23:05:50 +02:00 |
|
Muramasa
|
c66db54eab
|
Fixes & work on #266
|
2016-08-23 16:39:20 +01:00 |
|
Muramasa-
|
ccfc536501
|
Merge pull request #603 from Muramasa-/Mats
Material Rework
|
2016-08-22 22:50:58 +01:00 |
|
Muramasa
|
5a94ea039b
|
Some cleanup
|
2016-08-22 22:31:19 +01:00 |
|
Blood-Asp
|
0476a03635
|
update version
|
2016-08-22 23:06:04 +02:00 |
|
Blood-Asp
|
49e5b53706
|
#573 Turbines now explode when producing more EU than dynamo can handle
|
2016-08-22 23:01:29 +02:00 |
|
Blood-Asp
|
9ff430c80d
|
Fix #598 Delete saved recipe on machine change
|
2016-08-22 22:38:28 +02:00 |
|
Muramasa
|
5466ac4f52
|
Fixes #599
|
2016-08-22 20:25:13 +01:00 |
|
Muramasa
|
f8bd23f1b1
|
Fixes #561
|
2016-08-22 20:23:29 +01:00 |
|
Muramasa
|
afe222d2c1
|
Fixes #559
|
2016-08-22 20:21:53 +01:00 |
|
Muramasa
|
55133748f1
|
Fixes #561
|
2016-08-22 16:49:25 +01:00 |
|
Muramasa
|
29ebfa577c
|
Fixes #599
|
2016-08-22 16:47:43 +01:00 |
|
Muramasa
|
a987228a6a
|
Small fixes
|
2016-08-22 11:39:04 +01:00 |
|
Muramasa
|
0c4ec9a724
|
More compatibility fixes
|
2016-08-21 13:26:38 +01:00 |
|
Muramasa
|
a0066b4a26
|
General cleanup & MaterialProcessing
|
2016-08-21 11:57:36 +01:00 |
|
Muramasa
|
96b402648b
|
Constructor fix
|
2016-08-19 13:19:16 +01:00 |
|
Muramasa
|
2c2105284c
|
Whoops
|
2016-08-19 12:17:08 +01:00 |
|