Commit Graph
22 Commits
Author SHA1 Message Date
Progwml6 34812e761c use java based mantle 2013-12-05 00:29:59 -05:00
Progwml6 b57eb8bed1 remove redundant classes that are in mantle, use mantle's implementations 2013-12-01 19:46:08 -05: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
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
Sunstrike cc241aab67 Abort cloak render with Optifine. 2013-12-01 13:49:48 +00:00
Progwml6 a13b5396d4 missed these in refactoring 2013-11-30 09:48:30 -05:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Progwml6 07062a59d1 fix merge derps 2013-11-27 17:14:47 -05:00
Sunstrike 6ad0723020 Merge 1.7 prep into master.
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <[email protected]>
2013-11-27 17:46:07 +00:00
Progwml6 bb0db29ce8 update to Master commit bef5782
remove mod E from books
2013-11-26 07:08:06 -05:00
Progwml6 f693ee75e0 update to 1.5.1 RC2 c2cdb7 2013-11-25 19:40:43 -05:00
Progwml6 c429d8e6c5 swap flux into the electric modifiers old spots in the client proxy 2013-11-25 19:07:59 -05:00
Progwml6 f2da066da2 update to tcon 1.5.1RC1 commits 2013-11-25 18:57:54 -05:00
Progwml6 983c91c2c9 manual update of all master commits up to ca86fa8 2013-11-25 14:08:18 -05:00
Progwml6 14d357ccf6 manual merge of master branch changes up to commit 1387bc6 2013-11-23 09:31:19 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00