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 |
|
Bernhard Bonigl
|
1a486bb38e
|
Fix localization not working in ToolForge
|
2014-10-24 12:03:50 +02:00 |
|
Bernhard Bonigl
|
54590e82b0
|
Fix a bug in vikings PR?
|
2014-10-24 11:21:13 +02:00 |
|
TheVikingWarrior
|
ff114eda1b
|
Update ToolProxyClient.java
|
2014-10-23 22:25:20 +02: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
|
dbc446636f
|
Rework dagger into a projectileBase entity!
|
2014-10-22 23:42:08 +02:00 |
|
Bernhard Bonigl
|
46059d6913
|
Merge branch 'master' into weaponry
|
2014-10-22 23:05:45 +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 |
|
Bernhard Bonigl
|
514847a10d
|
NEI Support for right side of stencil table
|
2014-10-22 20:31:35 +02:00 |
|
Bernhard Bonigl
|
2a2cf76685
|
Remove tool crafting code that doesn't work and shouldn't exist from tinker table. Also fixes crashes with ITT repair in tinker tables.
|
2014-10-22 19:56:25 +02:00 |
|
Bernhard Bonigl
|
bd16981499
|
Merge branch 'master' into weaponry
|
2014-10-22 17:39:19 +02:00 |
|
Bernhard Bonigl
|
b3632e66bb
|
Fix InventoryCraftingStation accessing incorrect slots, that can sometimes lead to invalid accesses/crahes with some crafting stuff now.
|
2014-10-22 17:37:27 +02:00 |
|
Bernhard Bonigl
|
21c3464575
|
Fix CraftingStation exposing old nonexistant slots through ISided
|
2014-10-22 17:36:48 +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 |
|
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 |
|
Bernhard Bonigl
|
9672f95efc
|
Give ToolShards the DynamicToolPart treatment
|
2014-10-18 17:02:43 +02:00 |
|
Bernhard Bonigl
|
77ee46bc8c
|
Merge fixes n more
|
2014-10-16 18:03:34 +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 |
|
Bernhard Bonigl
|
c0e46f151b
|
Materials that shall have toolparts created for them have to be registered specifically now. Registering a material via IMC does so automatically. Should also fix the double-toolparts with extratic and other mod relying on the 1.6 API.
|
2014-10-15 23:17:41 +02:00 |
|
Bernhard Bonigl
|
f1ec9f24da
|
Merge branch 'master' into weaponry
Conflicts:
src/main/java/tconstruct/tools/TinkerTools.java
|
2014-10-14 23:20:38 +02:00 |
|
Bernhard Bonigl
|
82ca44bb66
|
Fix internal inventory size of crafting stations.
|
2014-10-13 11:14:07 +02:00 |
|
Bernhard Bonigl
|
be33e4d96c
|
Remove last usage of ToolPart and fix possible crash with displaying parts
|
2014-10-12 12:24:41 +02:00 |
|
Bernhard Bonigl
|
2988b75490
|
Fix colors for fletchlings on arrows
|
2014-10-10 13:06:34 +02:00 |
|
Bernhard Bonigl
|
852cecae7b
|
Merge branch 'master' into weaponry
|
2014-10-10 12:45:10 +02:00 |
|
Bernhard Bonigl
|
e3c3fa38ce
|
Add death penality dimishing returns: Dieing within 5 minutes reduces the damage to tools. The more often you die the less it takes, until you manage to live for 5 minutes.
|
2014-10-10 11:36:25 +02:00 |
|
Bernhard Bonigl
|
a99278c656
|
Merge branch 'master' into weaponry
Conflicts:
src/main/java/tconstruct/tools/ToolProxyClient.java
|
2014-10-10 00:45:18 +02:00 |
|
Bernhard Bonigl
|
66bfc70b0f
|
Don't use custom renderer unless needed, since it seems to cause performance problems on some systems
|
2014-10-10 00:44:01 +02:00 |
|
Bernhard Bonigl
|
3427ed6208
|
Redstone-Modifier for bows and similar!
|
2014-10-09 17:35:49 +02:00 |
|
Bernhard Bonigl
|
729d6a266f
|
Change Death penality to take difficulty into account. Easy/Peaceful = no penality, normal = 5%, hard = 10%
|
2014-10-08 22:26:54 +02:00 |
|
Bernhard Bonigl
|
72dcd8ac5f
|
Merge branch 'master' into weaponry
|
2014-10-08 20:41:47 +02:00 |
|
Bernhard Bonigl
|
72c180fab4
|
Add a config option to disable the death penality durability loss
|
2014-10-08 20:12:22 +02:00 |
|
Bernhard Bonigl
|
d39db6dc49
|
Dying costs 10% max durability of tools
|
2014-10-07 22:43:06 +02:00 |
|
Bernhard Bonigl
|
85a9bb2ce9
|
More juicy default color for alumite
|
2014-10-07 22:21:41 +02:00 |
|
Bernhard Bonigl
|
3b3f409a2c
|
Toolforges are not pattern chests.
|
2014-10-07 22:15:32 +02:00 |
|
Bernhard Bonigl
|
2c2b9ba281
|
Fix Paper creating blueslime parts if the paper config option is turned off. #1066
|
2014-10-07 21:15:05 +02:00 |
|
Bernhard Bonigl
|
6adeb21d7c
|
Merge branch 'master' into weaponry
|
2014-10-06 11:19:06 +02:00 |
|
Bernhard Bonigl
|
d89fd46d4c
|
Welcome back, old patternchest. Go push the new one already, @alexbegt :P
|
2014-10-06 10:24:22 +02:00 |
|
Bernhard Bonigl
|
a9482592d4
|
Merge branch 'master' into weaponry
|
2014-10-06 00:05:29 +02:00 |
|
Bernhard Bonigl
|
26181dd916
|
Spontanously added slimeleaf fletchling
|
2014-10-05 22:52:12 +02:00 |
|
boni
|
bd498aacb5
|
Merge pull request #1063 from Qowyn/nei-and-knapsack
New NEI feature and knapsack fix
|
2014-10-05 22:37:46 +02:00 |
|
Bernhard Bonigl
|
e7666e031b
|
Take all the shortbow and arrow stuff out of the Tools module, and try to keep backwards compatibility >_>
|
2014-10-05 22:20:30 +02:00 |
|
Qowyn
|
d92b0add32
|
Support for NEI crafting overlay in crafting station with attached chest.
|
2014-10-05 22:05:48 +02:00 |
|
Bernhard Bonigl
|
6e1ea0e736
|
Give the materials a bit more.. materialish default color
|
2014-10-05 18:17:32 +02:00 |
|
Bernhard Bonigl
|
0430391446
|
Fix autosmelt smelting even if the black can't be harvested with the tool #1053
|
2014-10-05 17:42:43 +02:00 |
|
Arthur Uzulin
|
6cc5d96a59
|
Fixed lighting issues while battlesign TESR is in view
|
2014-10-05 17:00:10 +11:00 |
|
boni
|
ae8d191ea8
|
Merge pull request #1045 from Qowyn/arrows-and-gui-fixes
Arrows and gui fixes
|
2014-10-04 17:00:21 +02:00 |
|
Bernhard Bonigl
|
d7b560c0ff
|
Prevent crash that sometimes happens when placing a tool/part/stencil whatever station block.
|
2014-10-01 21:13:27 +02:00 |
|