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 |
|
Dream-Master
|
c637ea6083
|
bump version
|
2016-09-09 08:53:27 +02:00 |
|
Dream-Master
|
8250a68c07
|
bump version
|
2016-09-09 08:52:50 +02:00 |
|
Martin Robertz
|
d008e6ae84
|
Merge pull request #19 from GTNewHorizons/Scanner-Buff
Scanner buff complete
|
2016-09-09 08:52:35 +02:00 |
|
Technus
|
a3ef374add
|
Scanner done.
|
2016-09-08 23:50:16 +02:00 |
|
Technus
|
97fc6e6f4c
|
scanner done
|
2016-09-08 23:43:46 +02:00 |
|
Technus
|
5e5ae2fb72
|
Scanner
|
2016-09-08 09:39:42 +02:00 |
|
Technus
|
4430c5b712
|
Scanner spacebars O:
|
2016-09-08 09:26:35 +02:00 |
|
Technus
|
86f5439e1a
|
Scanner work
|
2016-09-08 09:03:44 +02:00 |
|
Technus
|
b7ceab4a53
|
Scanner 2
|
2016-09-07 19:47:16 +02:00 |
|
Technus
|
0cb17155d3
|
More work on scanner
|
2016-09-07 19:43:31 +02:00 |
|
Technus
|
6198b220ee
|
Scanner 1
|
2016-09-07 19:43:12 +02:00 |
|
Technus
|
1fbd1ac81a
|
Ading textures - if possible cherry pick into main
|
2016-09-07 19:25:05 +02:00 |
|
Technus
|
5cc999c3f2
|
Revert "Update GT_RecipeAdder.java"
This reverts commit 4c4c26043f.
|
2016-09-04 23:27:27 +02:00 |
|
Daniel
|
4c4c26043f
|
Update GT_RecipeAdder.java
|
2016-09-04 23:24:03 +02:00 |
|
Dream-Master
|
12c3fbd1e1
|
bump version
|
2016-09-03 13:24:25 +02:00 |
|
Daniel
|
f0c73eda1f
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:19:18 +02:00 |
|
Daniel
|
eedfe0892e
|
Update GT_MetaTileEntity_LargeTurbine_Steam.java
|
2016-09-03 13:19:08 +02:00 |
|
Daniel
|
ced02dc186
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 13:18:56 +02:00 |
|
Daniel
|
05911e2fbd
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 13:18:37 +02:00 |
|
Daniel
|
6d536a232a
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 13:18:25 +02:00 |
|
Daniel
|
7dc2fac9d5
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:18:10 +02:00 |
|
Daniel
|
44a5f3f305
|
Update GT_MetaTileEntity_LargeTurbine.java
|
2016-09-03 13:17:52 +02:00 |
|
Daniel
|
1de6b9c23a
|
Update GT_MetaTileEntity_LargeTurbine_Plasma.java
|
2016-09-03 13:17:02 +02:00 |
|
Daniel
|
8e7e866990
|
Update GT_MetaTileEntity_LargeTurbine_Gas.java
|
2016-09-03 13:16:23 +02:00 |
|
Daniel
|
7e98a61fa2
|
Update GT_MetaTileEntity_LargeTurbine_HPSteam.java
|
2016-09-03 13:15:05 +02: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 |
|
Dream-Master
|
0cc91372f9
|
remove empty class
|
2016-09-03 12:06:13 +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 |
|
Dream-Master
|
ee80bb8021
|
bump version
|
2016-09-03 00:52:52 +02:00 |
|
Dream-Master
|
a280813749
|
remove pollution too
|
2016-09-03 00:48:38 +02:00 |
|
Dream-Master
|
b8aa41e9df
|
Pollution remove
|
2016-09-03 00:45:47 +02:00 |
|