Commit Graph
519 Commits
Author SHA1 Message Date
Bernhard Bonigl c42f99cba7 Merge branch 'master' into weaponry
Conflicts:
	.gitignore
	build.properties
2014-11-15 23:17:27 +01:00
[MMKP]Puyo061 b1ce15507b Update Korean translation 2014-11-03 22:37:33 +09:00
Mrkwtkr 5390a2df6b Update zh_CN.lang 2014-11-03 12:15:32 +08:00
Bernhard Bonigl 964135c481 Merge branch 'master' into weaponry 2014-11-02 18:02:57 +01:00
Bernhard Bonigl 4b145828cd Add the flux modifier restriction to the book 2014-11-02 16:24:35 +01:00
Bernhard Bonigl ce8b37a39e Javelin Modifier Graphics 2014-11-01 20:56:46 +01:00
Bernhard Bonigl 0fc518487d Toolforge localizations for the new stuffs 2014-10-31 14:17:46 +01:00
Bernhard Bonigl 9d7d33fea3 Javelins now can be used properly as melee and ranged weapons 2014-10-30 13:14:43 +01:00
Bernhard Bonigl 6cd7b497e8 Weaponry booooooook 2014-10-29 22:33:00 +01:00
Bernhard Bonigl b291c2671c Weaponry Book content 2014-10-28 21:35:11 +01:00
Bernhard Bonigl 0763397e12 Bolt effect graphics 2014-10-28 19:53:36 +01:00
Bernhard Bonigl f4616cfe6f Localize weaponry 2014-10-28 19:23:34 +01:00
Bernhard Bonigl 525baf8aad Add display and calculation stuff for maximum damage with thrown weapons 2014-10-28 18:52:11 +01:00
Bernhard Bonigl 0146627262 Bring Traits in line with GUI stuff etc. 2014-10-28 18:16:08 +01:00
Mrkwtkr 09b77a63ca Update firstday.xml
No more change. :P
2014-10-28 13:19:40 +08:00
Mrkwtkr 81a15536b1 Fix a lot. 2014-10-28 13:11:22 +08:00
Mrkwtkr 71670edeb7 Update zh_CN.lang 2014-10-28 12:28:09 +08:00
Mrkwtkr 92960a82f2 Update zh_CN.lang 2014-10-28 12:20:59 +08:00
Bernhard Bonigl 947da8f9df Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/ToolProxyClient.java
2014-10-26 17:10:09 +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
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
boni 735360f2c6 Merge pull request #1116 from Adaptivity/patch-2
Update ru_RU.lang
2014-10-25 09:31:21 +02:00
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 4c1852546e ToolStation/Forge GUI for the new weapons 2014-10-24 14:58:27 +02:00
Bernhard Bonigl 939bd8a0ae Merge branch 'master' into weaponry
Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
2014-10-24 13:17:48 +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
TheVikingWarrior ce9a74b6a6 Update en_US.lang 2014-10-23 22:28:31 +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 50a485b14d Add null check for each manual and change the localtions of pics. 2014-10-23 07:15:22 +08:00
Bernhard Bonigl 46059d6913 Merge branch 'master' into weaponry 2014-10-22 23:05:45 +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
boni fdc3fc09df Merge pull request #1110 from TheVikingWarrior/patch-4
Nei localized
2014-10-22 22:22:28 +02:00
Bernhard Bonigl ffcd7f26b4 Step 1: Give @TheVikingWarrior an example of how to translate toolstation tool descriptions 2014-10-22 22:22:00 +02:00
TheVikingWarrior 96572d1282 Update it_IT.lang 2014-10-22 22:02:11 +02:00
TheVikingWarrior af09542f71 Update en_US.lang 2014-10-22 22:02:08 +02:00
Bernhard Bonigl f1d048128d Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-22 21:55:11 +02:00
Bernhard Bonigl d2681d11c7 Add localization for king slime tools 2014-10-22 21:55:04 +02:00
TheVikingWarrior 4ede7e9596 Update it_IT.lang 2014-10-22 21:22:16 +02:00
TheVikingWarrior 348ec21520 Merge pull request #8 from TheVikingWarrior/patch-1
Localized waila
2014-10-22 21:21:27 +02:00
TheVikingWarrior 5369d314d6 Update it_IT.lang 2014-10-22 21:07:02 +02:00