upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,592 Commits 6 Branches 324 Tags
ecf5d0e9901a1ecec3739d976ff2ece494edb95b
Commit Graph
933 Commits
Author SHA1 Message Date
Bernhard Bonigl ecf5d0e990 Give javelin the other crosshair thing 2014-10-26 20:11:24 +01:00
Bernhard Bonigl 24cc1e773d Projectiles now slowly regrow with moss :D 2014-10-26 20:08:10 +01:00
Bernhard Bonigl 0691d2167f De-debug shuriken :I 2014-10-26 19:59:54 +01:00
Bernhard Bonigl f9fedafa60 Reinforced on projectiles causes them to sometimes not break when hitting entities! 2014-10-26 19:42:27 +01:00
Bernhard Bonigl 08cd6c5354 Fix arrow/bolt accuracy and breakchance being mixed up :( 2014-10-26 19:42:10 +01:00
Bernhard Bonigl dc1ecab768 Arrows with knockback :D:D 2014-10-26 18:50:50 +01:00
Bernhard Bonigl d96379f753 Merge branch 'master' into weaponry 2014-10-26 18:26:36 +01:00
Bernhard Bonigl 971b84c3e4 Really fix the crafting table crashes. Derp. #1126 2014-10-26 18:15:26 +01: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
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 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 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 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
Bernhard Bonigl 4c1852546e ToolStation/Forge GUI for the new weapons 2014-10-24 14:58:27 +02:00
Bernhard Bonigl 45247bd9cb Fix shortbow using wrong description in tool station/forge 2014-10-24 13:37:30 +02:00
Bernhard Bonigl 5bfdb0d769 Rework stencil table button layout to weaponry and more NEI fix 2014-10-24 13:30:46 +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
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
TheVikingWarrior ff114eda1b Update ToolProxyClient.java 2014-10-23 22:25:20 +02: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 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 035cc454a5 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-10-22 23:05:09 +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 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
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 18c0360ab3 Update RecipeHandlerToolMaterials.java 2014-10-22 22:00:31 +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 348ec21520 Merge pull request #8 from TheVikingWarrior/patch-1 
Localized waila
 2014-10-22 21:21:27 +02:00