Commit Graph
2528 Commits
Author SHA1 Message Date
Bernhard Bonigl 6f2ee0f2a4 Force-enable tools, smeltery and world because of dependencies in between these three. Needs restructuring. 2014-10-26 16:51:59 +01:00
Bernhard Bonigl 02fd32c7cf Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-26 16:49:34 +01:00
Bernhard Bonigl e1d2c8e3f6 Fix FML Events not getting called. #1121 2014-10-26 16:49:27 +01:00
Bernhard Bonigl 71b0f65d63 Prevent crash with invalid material toolparts. #1124 2014-10-26 16:36:14 +01:00
Bernhard Bonigl 5905653f80 Fix build from PR 2014-10-26 16:32:35 +01:00
boni ae3eae19e4 Merge pull request #1122 from TheVikingWarrior/patch-3
Update it_IT.lang
2014-10-26 09:19:37 +01:00
TheVikingWarrior a3deeb7bea Update en_US.lang 2014-10-25 23:03:24 +02:00
TheVikingWarrior 6ae4e6954d Update it_IT.lang 2014-10-25 23:02:28 +02:00
boni f5d1e0a710 Merge pull request #1120 from Mrkwtkr/patch-2
Translation of manuals
2014-10-25 19:33:42 +02:00
Mrkwtkr 82ff69887a Create smeltery.xml 2014-10-26 01:15:28 +08:00
Mrkwtkr fb6d7bf4b1 Create materials.xml 2014-10-26 01:14:24 +08:00
Mrkwtkr 5d87f6e322 Create firstday.xml 2014-10-26 01:13:37 +08:00
Mrkwtkr b6a09c35d4 Create diary.xml 2014-10-26 01:02:26 +08:00
boni 506731d618 Merge pull request #1115 from puyo061/patch-2
Update Korean translation
2014-10-25 18:53:37 +02:00
boni 20e295123c Merge pull request #1100 from crafteverywhere/master
Make the manuals translatable.
2014-10-25 18:53:12 +02:00
Bernhard Bonigl f027de5ab9 Config option to disable the flux modifier battery restriction in case ti's needed somewhere. (Looking at you there, HQM Maps.) 2014-10-25 18:51:38 +02:00
boni 735360f2c6 Merge pull request #1116 from Adaptivity/patch-2
Update ru_RU.lang
2014-10-25 09:31:21 +02:00
boni ed9615a93d Merge pull request #1114 from MikeLydeamore/master
Added /dev/null block placing functionality
2014-10-25 09:30:50 +02:00
Michael Lydeamore 1db5375d35 Added /dev/null functionality
Moved finding to TinkerTools
2014-10-25 17:01:53 +10:30
Anton 889e434865 Update ru_RU.lang 2014-10-24 19:41:18 +04:00
[MMKP]Puyo061 c49ab30a23 Update ko_KR.lang 2014-10-24 22:28:30 +09:00
Bernhard Bonigl 45247bd9cb Fix shortbow using wrong description in tool station/forge 2014-10-24 13:37:30 +02:00
Bernhard Bonigl 2e9e347255 Fix some typos in the toolstation localization strings and simplify the whole localization stuff in code. 2014-10-24 12:36:40 +02:00
Bernhard Bonigl 8630e5e701 Fix toolstation localization pr 2014-10-24 12:04:13 +02:00
Bernhard Bonigl 1a486bb38e Fix localization not working in ToolForge 2014-10-24 12:03:50 +02:00
Bernhard Bonigl 57c3158ef4 Reduce increased flux cost per block mined, and fix a derp with the charging. 2014-10-24 11:52:39 +02:00
Bernhard Bonigl f734169ad6 Flux modifier now requires the tool to have at least charge/1000 durability for the battery to be applicable. 2014-10-24 11:52:19 +02:00
Bernhard Bonigl 2aa42a5b8a Debugstuff :I 2014-10-24 11:37:03 +02:00
Bernhard Bonigl 54590e82b0 Fix a bug in vikings PR? 2014-10-24 11:21:13 +02:00
Bernhard Bonigl edf30d3a5c Flux modified tools now charge properly with the charge rate if CoFHCore is present. WITHOUT breaking blockbreak process. This also fixes moss-repair resetting. 2014-10-24 11:20:28 +02:00
boni 78167ba7ac Merge pull request #1117 from TheVikingWarrior/patch-5
Tool Station is localized
2014-10-23 23:01:50 +02:00
TheVikingWarrior ce9a74b6a6 Update en_US.lang 2014-10-23 22:28:31 +02:00
TheVikingWarrior ff114eda1b Update ToolProxyClient.java 2014-10-23 22:25:20 +02:00
Anton abebeead80 Update ru_RU.lang 2014-10-23 19:10:04 +04:00
[MMKP]Puyo061 2f2316b38c Update Korean translation 2014-10-24 00:02:18 +09:00
crafteverywhere 79b0d6e8c7 Update TProxyClient.java 2014-10-23 07:19:01 +08:00
crafteverywhere 50a485b14d Add null check for each manual and change the localtions of pics. 2014-10-23 07:15:22 +08:00
Bernhard Bonigl b9efa7373f Change stencils to be identified by actual IDs because DAMN was that other stuff a pain to use if you wanted to identify one. 2014-10-23 00:14:27 +02:00
Bernhard Bonigl 035cc454a5 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-22 23:05:09 +02:00
boni 067f78ccef Merge pull request #1111 from TheVikingWarrior/patch-2
More nei localization
2014-10-22 23:04:06 +02:00
Bernhard Bonigl 8b154ea1b9 Register belt/goggle packets. You can actually deactivate goggles now, wooooo 2014-10-22 23:03:34 +02:00
Bernhard Bonigl e37b32234f Fix armorcontrols having two separate instances. Fixes doublejump issue #1108 2014-10-22 22:51:08 +02:00
TheVikingWarrior b532036f5d Update it_IT.lang 2014-10-22 22:46:30 +02:00
TheVikingWarrior 19859f685a Update en_US.lang 2014-10-22 22:43:15 +02:00
TheVikingWarrior b9280a3b89 Update RecipeHandlerMelting.java 2014-10-22 22:42:01 +02:00
TheVikingWarrior 422158e879 Update RecipeHandlerDryingRack.java 2014-10-22 22:40:58 +02:00
TheVikingWarrior 71275e7235 Update RecipeHandlerCastingTable.java 2014-10-22 22:39:38 +02:00
TheVikingWarrior a924cbf983 Update RecipeHandlerCastingBasin.java 2014-10-22 22:38:32 +02:00
TheVikingWarrior a6760150b3 Update RecipeHandlerAlloying.java 2014-10-22 22:37:12 +02:00
TheVikingWarrior b47464b0b0 Update RecipeHandlerToolMaterials.java 2014-10-22 22:34:45 +02:00