Commit Graph
2423 Commits
Author SHA1 Message Date
TheVikingWarrior 5954506f37 Deleted fluid.platinum , i'm not sure that it's ment to be there 2013-11-14 20:06:36 +01:00
Vexatos 408b691156 Update de_DE.lang 2013-11-14 17:04:06 +01:00
tmpillbox 0d258b2594 RedstoneMachine? Never heard of it.
Psst. Check TinkersMechworks; you won't be disappointed.
2013-11-13 22:43:22 -06:00
Zach eb06f3c629 Merge pull request #323 from TheVikingWarrior/patch-1
Molten Electrum Localization
2013-11-13 10:33:45 -08:00
TheVikingWarrior 1c4d187189 Molten Electrum Localization
Added localiztion for "fluid.electrum.molten", which I think it missed because it was confused with "fluid.platinum.molten" (it's the only localization for Molten Platinum, while electrum is the only missing) and i would deleat it if you give me the permision.
Also changed tile.metal.molten.electrum.name
2013-11-12 22:14:08 +01:00
Progwml6 c0230c318a Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-12 01:02:29 -05:00
Progwml6 88dbd29f87 add in textures for flux modifier, re-enable them in code -- several textures not done yet -- electric ones copied in lieu of this 2013-11-12 01:02:20 -05:00
mDiyo 9a88c8c20f Ore material is now rock 2013-11-11 14:51:13 -08:00
mDiyo e993305212 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-11 14:50:27 -08:00
Zach a3d23846c8 Merge pull request #319 from Vexatos/patch-2
Update de_DE.lang
2013-11-11 11:01:45 -08:00
Zach 9f61757500 Merge pull request #320 from TheVikingWarrior/patch-6
Update it_IT.lang
2013-11-11 11:01:34 -08:00
Progwml6 f2e60e7fb1 java 6 doesnt support that 2013-11-11 13:27:15 -05:00
Progwml6 a4c2095a66 lets not harcode the path of tcontent 2013-11-11 13:23:38 -05:00
Progwml6 d34efd82f3 put supression back in , use reflection in toolcore, etc 2013-11-11 13:20:32 -05:00
TheVikingWarrior 95318a6797 Update it_IT.lang 2013-11-11 18:50:42 +01:00
Progwml6 bba89717c5 clean up imports 2013-11-11 12:30:40 -05:00
Progwml6 84fb190a79 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-11 12:15:25 -05:00
Progwml6 56873dcf17 protect clean up TE intergration code, add into TCon lib a mathutil class for simple math helper functions 2013-11-11 12:07:28 -05:00
TheVikingWarrior 9a5a086614 Update it_IT.lang 2013-11-11 17:59:55 +01:00
Vexatos d6a229c515 Update de_DE.lang 2013-11-11 16:45:34 +01:00
mDiyo 3898f41d17 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-11 04:14:12 -08:00
mDiyo 268adc64e5 Remove water/lava fluid registration 2013-11-11 04:13:44 -08:00
tmpillbox f40d63a72c Signalectomy. See TinkersMechworks for signals 2013-11-10 23:49:28 -06:00
mDiyo 6f0e84e26d Cleanup ToolCore 2013-11-10 19:27:26 -08:00
mDiyo 7cab7536a1 Unnamed tools can be named when modified 2013-11-10 19:07:39 -08:00
mDiyo 2734753aad Add pickmattock sprites 2013-11-10 18:53:25 -08:00
mDiyo 4907129595 Fix missing speed values in ModRedstone 2013-11-10 17:51:18 -08:00
Progwml6 8eff206358 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-10 20:15:53 -05:00
Progwml6 68ff6cd544 fix rendering issues w/ flux modifier, set it to use electric modifier textures for now 2013-11-10 20:15:39 -05:00
mDiyo dee3482198 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-10 17:06:33 -08:00
mDiyo 2553eb2377 Fix Smeltery null crash, remove crystalline content 2013-11-10 17:05:50 -08:00
Progwml6 2c96a62081 NBT names are case sensative 2013-11-10 18:37:53 -05:00
Progwml6 4eb9289296 more work on flux modifier 2013-11-10 17:32:55 -05:00
mDiyo fdcb651ef4 Format cleanup 2013-11-10 13:57:35 -08:00
Zach c6ef343106 Merge pull request #315 from crafteverywhere/patch-2
Update zh_CN.lang
2013-11-10 11:38:51 -08:00
Zach d3535e7e13 Merge pull request #316 from Vexatos/patch-2
Update de_DE.lang
2013-11-10 11:38:38 -08:00
Zach 10b002e778 Merge pull request #318 from TheVikingWarrior/patch-5
Update it_IT.lang
2013-11-10 11:38:32 -08:00
TheVikingWarrior d02e7241e6 Update it_IT.lang
I'm going to translate them when i'll understand what they do
2013-11-10 18:57:56 +01:00
Vexatos 81fc33dec9 Update de_DE.lang 2013-11-10 17:04:35 +01:00
mDiyo 2f9525256e Terraformer start 2013-11-10 06:06:21 -08:00
mDiyo b4c5ce5653 Add missing recipe and name for slab furnace 2013-11-09 14:36:23 -08:00
mDiyo 4686e3150d Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-09 14:29:37 -08:00
mDiyo 6440c4715f Adjust lots of block behavior, furnace slabs 2013-11-09 14:28:48 -08:00
crafteverywhere c2a5d34608 Update zh_CN.lang 2013-11-10 03:42:07 +08:00
Zach af2cd6a9f3 Merge pull request #314 from TheVikingWarrior/patch-4
Update it_IT.lang
2013-11-09 11:27:12 -08:00
TheVikingWarrior ab5175da7e Update it_IT.lang 2013-11-09 20:07:46 +01:00
tmcgeorge 5f9cb06963 A little care taken for scanning a keyset 2013-11-09 12:39:38 -06:00
tmcgeorge aeb7671387 Signal Bus cleanup and placement/breaking sanity 2013-11-09 11:58:44 -06:00
mDiyo 8caec7621b Proper level for compressed cobble melting 2013-11-09 09:48:18 -08:00
mDiyo 92b5e9fb7d Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-09 09:43:05 -08:00