Sunstrike
|
5010b8f310
|
Merge pull request #369 from crafteverywhere/patch-3
Update zh_CN.lang
|
2013-12-04 05:57:51 -08:00 |
|
crafteverywhere
|
20475c0cc6
|
Update zh_CN.lang
|
2013-12-04 15:45:37 +08:00 |
|
Sunstrike
|
7290be22ab
|
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
|
2013-12-03 19:30:36 +00:00 |
|
Sunstrike
|
7776f7f35d
|
(Preloader) Restore getLibraryRequestClass but keep it deprecated.
|
2013-12-03 19:29:57 +00:00 |
|
Sunstrike
|
0158db7064
|
Merge pull request #368 from Vexatos/patch-2
PRs needed to upstream "Languages/German"...
|
2013-12-02 14:25:14 -08:00 |
|
Vexatos
|
da4f1aadc2
|
German has soo long words :(
|
2013-12-02 21:32:56 +01:00 |
|
Progwml6
|
537aa284b0
|
add hard dep to mantle
|
2013-12-02 13:30:24 -05:00 |
|
Progwml6
|
b57eb8bed1
|
remove redundant classes that are in mantle, use mantle's implementations
|
2013-12-01 19:46:08 -05:00 |
|
Sunstrike
|
a181dc9dcf
|
Start IC2 compat.
...Not. Bwahahah.
|
2013-12-01 23:17:22 +00:00 |
|
Sunstrike
|
9ccbe48bfe
|
Fix IFacingLogic using the wrong interface (now in Mantle).
|
2013-12-01 21:55:04 +00:00 |
|
Sunstrike
|
08fd425c8f
|
Fix wtf code merge.
Removed extra brackets from StatCollector references (PLEASE check this before PRs), replaced TContent references with TRepo as needed.
|
2013-12-01 21:42:03 +00:00 |
|
Zach
|
eb7975e442
|
Merge pull request #367 from TheVikingWarrior/patch-1
Patch 1
|
2013-12-01 12:57:29 -08:00 |
|
TheVikingWarrior
|
1c4f112c71
|
Update ToolStationGui.java
|
2013-12-01 20:42:05 +01:00 |
|
TheVikingWarrior
|
3633f4bbee
|
Update ToolForgeGui.java
|
2013-12-01 20:41:33 +01:00 |
|
TheVikingWarrior
|
ea218c6099
|
Update StencilTableGui.java
|
2013-12-01 20:40:42 +01:00 |
|
TheVikingWarrior
|
f7081180d3
|
Update SmelteryGui.java
|
2013-12-01 20:40:08 +01:00 |
|
TheVikingWarrior
|
0ff2ea0eeb
|
Update PartCrafterGui.java
|
2013-12-01 20:39:36 +01:00 |
|
TheVikingWarrior
|
e29d9eb111
|
Update AdaptiveSmelteryGui.java
|
2013-12-01 20:38:58 +01:00 |
|
TheVikingWarrior
|
0c3e052bf4
|
Update en_US.lang
|
2013-12-01 20:37:40 +01:00 |
|
Sunstrike
|
cc241aab67
|
Abort cloak render with Optifine.
|
2013-12-01 13:49:48 +00:00 |
|
Sunstrike
|
e763bb6363
|
Move some stuff out into Mantle.
|
2013-12-01 12:19:43 +00:00 |
|
Sunstrike
|
ef70d27bee
|
Update Mantle.
|
2013-12-01 12:18:50 +00:00 |
|
Progwml6
|
16c6b6a532
|
welcome back Mantle
|
2013-11-30 18:47:49 -05:00 |
|
Sunstrike
|
c037a13f18
|
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
|
2013-11-30 19:55:07 +00:00 |
|
Sunstrike
|
f68a27be28
|
Bad Magic Launcher, bad! *whacks*
|
2013-11-30 19:50:18 +00:00 |
|
Progwml6
|
469c1c62d9
|
version #'s for dependencies now loaded from properties file
|
2013-11-30 14:47:58 -05:00 |
|
Sunstrike
|
f3b31b7914
|
Fix Git not finishing fast enough in build.gradle
|
2013-11-30 19:09:12 +00:00 |
|
Sunstrike
|
587ba53a36
|
Change root project ID to match Ant
|
2013-11-30 18:55:12 +00:00 |
|
Sunstrike
|
5b8311a882
|
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
|
2013-11-30 18:47:04 +00:00 |
|
Sunstrike
|
5012c3a60c
|
GITBORK if Git isn't working.
|
2013-11-30 18:46:53 +00:00 |
|
Progwml6
|
a32ac02b9c
|
clean up fluids & fluidBlocks variable declaration
|
2013-11-30 13:35:54 -05:00 |
|
Sunstrike
|
de0a33fcdd
|
Slightly tweak builder output format
|
2013-11-30 18:23:46 +00:00 |
|
Sunstrike
|
7c68cfbcc5
|
Update preloader to 0.1.1
Restore AT function (went missing in a merge), add verbose log toggle, reinforce PropertyManager.
|
2013-11-30 17:59:28 +00:00 |
|
Sunstrike
|
ec005e14ad
|
Fix recipes crash
|
2013-11-30 17:57:22 +00:00 |
|
Sunstrike
|
f77f89e208
|
Cleanup dimension blacklist.
|
2013-11-30 17:06:50 +00:00 |
|
Zach
|
e46e57c9ca
|
Merge pull request #364 from Vexatos/patch-2
Update de_DE.lang
|
2013-11-30 07:36:06 -08:00 |
|
Progwml6
|
a13b5396d4
|
missed these in refactoring
|
2013-11-30 09:48:30 -05:00 |
|
Vexatos
|
6f0fa31cc5
|
Update de_DE.lang
|
2013-11-30 11:16:06 +01:00 |
|
Progwml6
|
b6da5dcca4
|
clean up imports, run TContent/ new classes through formatter
|
2013-11-29 23:50:14 -05:00 |
|
Progwml6
|
b79ed2c933
|
more of tcontent refactors
|
2013-11-29 23:46:55 -05:00 |
|
Progwml6
|
f31e0cd2e5
|
part 1A
|
2013-11-29 23:19:39 -05:00 |
|
Progwml6
|
6671cd9a3f
|
Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct
|
2013-11-29 23:16:44 -05:00 |
|
Progwml6
|
1a74c0768f
|
TContent refactor Part 1
|
2013-11-29 23:16:32 -05:00 |
|
Sunstrike
|
ca4f4205d2
|
Force Mystcraft plugin to load unconditionally.
This cannot be overridden by TDynstruct.cfg for balance sake.
|
2013-11-29 21:10:58 +00:00 |
|
Sunstrike
|
dfde917a39
|
Less noise please. I think the comedy message is sufficient now.
|
2013-11-29 20:39:07 +00:00 |
|
Sunstrike
|
35367bb1fd
|
Transition old IMC plugins to new compat loader.
These old ones need to be removed still and all TContent refs need updated in these when refactor occurs.
|
2013-11-29 20:33:49 +00:00 |
|
Sunstrike
|
3b3b439cfb
|
Transition to using FML's suggested config file, not Tinkers Workshop.txt
|
2013-11-29 19:52:03 +00:00 |
|
Sunstrike
|
4698b28179
|
TDynstruct.cfg can now be used to toggle compat plugins.
|
2013-11-29 19:46:40 +00:00 |
|
Sunstrike
|
bd213f60d9
|
Silly IDEA and Vim junk...
|
2013-11-29 19:46:13 +00:00 |
|
Progwml6
|
241bfcf0d5
|
fix another merge derp
|
2013-11-28 16:33:14 -05:00 |
|