Commit Graph
67 Commits
Author SHA1 Message Date
mDiyo 086cc97ddc Rewrote ModAttack to accept multiple items 2013-12-12 03:08:05 -08:00
mDiyo 977287e440 Crafting Station can modify tools if near a Tool Station 2013-12-11 22:10:57 -08:00
Progwml6 faedd83413 fix manual merge derps 2013-12-12 00:13:21 -05:00
Progwml6 0c9c8100ad manual merges of up to 9a578fc 2013-12-11 23:47:07 -05:00
Sunstrike 61ef61058c Change to new Mantle DebugData 2013-12-10 01:36:17 +00:00
Sunstrike ec2d94662c SmelteryLogic IDebuggable 2013-12-09 18:19:47 +00:00
Sunstrike c973e417f6 Migrate legacy Block references to MantleBlock 2013-12-09 15:10:58 +00:00
Sunstrike 1547849ccc Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-09 14:48:27 +00:00
Sunstrike c37b6fe93f Use the new MultiServantLogic path. 2013-12-09 14:48:18 +00:00
Progwml6 e79d411131 remove useless mathutils class, move idrawbridgelogic to TMech 2013-12-09 05:14:03 -05:00
Progwml6 3744f8a886 te compat fixes/tweaks 2013-12-06 19:24:05 -05:00
mDiyo b61c1c581d Linux capitalization weirdness 2013-12-06 11:53:18 -08:00
mDiyo 91271f6bb2 Fix merge conflicts 2013-12-06 11:46:23 -08:00
mDiyo 85aaa05d4b Crafting Station Prototype 2013-12-06 11:37:06 -08:00
Progwml6 bbec72109a move more block logic to mantle 2013-12-06 13:33:55 -05:00
Sunstrike d19d4d4a0c Update Mantle, further thin TCon env checks, move optifine detection out to Mantle. 2013-12-06 16:57:33 +00:00
Sunstrike 7f57b8b30b 'Fix' funny start messages. 2013-12-06 16:26:36 +00:00
Sunstrike 179f9dfa05 Compact EnvChecks and use Mantle callables. 2013-12-06 16:18:07 +00:00
Progwml6 aa4ac3f310 update versioning 2013-12-05 16:34:01 -05:00
mDiyo 6dd171c27a Exo-Armor start 2013-12-05 00:03:01 -08:00
Progwml6 6efd8a83fd remove class exists in mantle 2013-12-05 01:46:40 -05:00
Progwml6 34812e761c use java based mantle 2013-12-05 00:29:59 -05:00
Sunstrike 46c90ff3c1 Fix localization bug affecting Waila. 2013-12-04 15:37:40 +00:00
Sunstrike 6b4309a675 Maybe slightly too trolly.
...Keeping the rest though, it's just funny.
2013-12-04 14:57:48 +00: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
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
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
Sunstrike e763bb6363 Move some stuff out into Mantle. 2013-12-01 12:19:43 +00:00
Sunstrike f68a27be28 Bad Magic Launcher, bad! *whacks* 2013-11-30 19:50:18 +00:00
Progwml6 a32ac02b9c clean up fluids & fluidBlocks variable declaration 2013-11-30 13:35:54 -05: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
Progwml6 a13b5396d4 missed these in refactoring 2013-11-30 09:48:30 -05: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