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 |
|
TheVikingWarrior
|
9e0b8030ca
|
Update en_US.lang
|
2014-10-22 21:04:54 +02:00 |
|
Bernhard Bonigl
|
a1434c0e33
|
Merge branch 'master' into weaponry
|
2014-10-21 20:59:46 +02:00 |
|
Bernhard Bonigl
|
bd02e5419f
|
Slimy trait now has a small chance to summon a small slime when breaking blocks :3
|
2014-10-21 17:10:28 +02:00 |
|
TheVikingWarrior
|
2734e0fd2b
|
Update it_IT.lang
|
2014-10-20 19:52:19 +02:00 |
|
Bernhard Bonigl
|
9f64ef46e8
|
Projectile Weapons tooltip displays the max damage with the current ammo
|
2014-10-19 16:49:04 +02:00 |
|
Bernhard Bonigl
|
11fcf21eb6
|
More arrow tags and display fixes
|
2014-10-19 16:23:01 +02:00 |
|
Bernhard Bonigl
|
e7454a56ac
|
Some rendering stuff and fixes with bolts/arrows
|
2014-10-19 15:45:08 +02:00 |
|
Bernhard Bonigl
|
f31e41447c
|
Merge branch 'master' into weaponry
Conflicts:
src/main/java/tconstruct/items/tools/Arrow.java
src/main/java/tconstruct/tools/TinkerTools.java
|
2014-10-19 14:12:50 +02:00 |
|
crafteverywhere
|
fb4c0ddf9e
|
make the manuals translatable.
|
2014-10-19 05:37:19 +08:00 |
|
Bernhard Bonigl
|
ea46704872
|
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
|
2014-10-18 17:17:00 +02:00 |
|
Bernhard Bonigl
|
9672f95efc
|
Give ToolShards the DynamicToolPart treatment
|
2014-10-18 17:02:43 +02:00 |
|
Bernhard Bonigl
|
62905da392
|
Crossbow Modifier Graphics \o/
|
2014-10-17 01:03:53 +02:00 |
|
Bernhard Bonigl
|
a7f7258b04
|
Throwingknife and Shuriken modifiers
|
2014-10-16 18:03:46 +02:00 |
|
Bernhard Bonigl
|
65ce5f23c2
|
Merge branch 'master' into weaponry
Conflicts:
src/main/java/tconstruct/tools/TinkerTools.java
|
2014-10-16 16:13:11 +02:00 |
|
[MMKP]Puyo061
|
95af0b1c6d
|
Update ko_KR.lang
|
2014-10-16 22:43:11 +09:00 |
|
Anton
|
f14b190d8c
|
Update ru_RU.lang
|
2014-10-16 13:33:54 +04:00 |
|
Bernhard Bonigl
|
d80bd63e7a
|
Make @Adaptivity happy
|
2014-10-16 11:10:40 +02:00 |
|
Bernhard Bonigl
|
645102aae2
|
Revert changes to AT that accidently made it in. Not used.
|
2014-10-14 23:11:04 +02:00 |
|