Commit Graph
1214 Commits
Author SHA1 Message Date
Sunstrike 014ca12959 Update NEI as CB has deleted it... again... 2013-12-13 21:18:39 +00:00
Progwml6 931b2bd799 make recipe variable in tconstruct that is static, remove static calls on methods in trecipes 2013-12-13 16:07:26 -05:00
mDiyo 90f09b7e2d First armor modifier 2013-12-12 21:05:26 -08:00
mDiyo 8b154a9cb4 All modifiers changed to use the tinker table 2013-12-12 14:21:30 -08:00
mDiyo 50fdf1b161 Fix filter amounts 2013-12-12 03:22:27 -08:00
mDiyo 30e51d33aa Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-12 03:08:40 -08:00
mDiyo 086cc97ddc Rewrote ModAttack to accept multiple items 2013-12-12 03:08:05 -08:00
Progwml6 55eeaf1561 clean up old stuff, bump required version to 1.6.4 in master as a result 2013-12-12 03:30:41 -05: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
Progwml6 655780cc0c nether smeltery coming to a master branch near you 2013-12-11 22:55:31 -05:00
Sunstrike 66024ff652 Update NEI dep as CB removed the old one, breaking the build. 2013-12-11 22:26:04 +00:00
Sunstrike cc80c0a187 Update build.gradle.
Cleanup formatting and comments, remove legacy Minecraft libraries download repo.
2013-12-11 21:56:32 +00:00
Sunstrike a9563c21f3 Merge pull request #378 from Vexatos/patch-2
Update de_DE.lang
2013-12-11 13:32:57 -08:00
Vexatos ba395ab060 Update de_DE.lang 2013-12-11 16:37:45 +01:00
Sunstrike 61ef61058c Change to new Mantle DebugData 2013-12-10 01:36:17 +00:00
Sunstrike 62e14d4c5f Update Mantle.
InventoryBlock wasn't respecting IDebuggable.
2013-12-09 18:37:09 +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
Sunstrike c8f347f7e4 Update Mantle. 2013-12-09 14:48:02 +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
Sunstrike 34c54a60a9 Update Mantle to 02b512.
Make crash callables public.
2013-12-06 16:10:26 +00:00
Progwml6 bd93fdd279 fix capitalization derp 2013-12-06 01:24:32 -05: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 4fe395e99c Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-04 14:58:08 +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 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