Commit Graph
1565 Commits
Author SHA1 Message Date
Bernhard Bonigl ee980ccca0 Merge branch 'master' into experimental
Conflicts:
	resources/assets/tinker/lang/en_US.lang
2014-12-02 20:43:56 +01:00
Bernhard Bonigl ea875724bd Add nugget cast and nugget casting 2014-12-02 20:42:47 +01:00
Bernhard Bonigl 007c1a457c Merge branch 'master' into experimental 2014-12-02 16:18:15 +01:00
Bernhard Bonigl 3e0c4f5e0e Fix tanks not implementing fluid-api properly. canDrain/canFill #1208 2014-12-02 15:28:52 +01:00
Bernhard Bonigl 8623b0978b Fix server-crash on king silme death #1209 2014-12-02 15:26:23 +01:00
Bernhard Bonigl af6fbec293 Battlesign reflecting takes durability and doesn't work while it's broken 2014-11-30 14:34:28 +01:00
Bernhard Bonigl 49813550b4 Change battlesign-blocking to actually require you to look at the arrow + reflection speed depends on how much you looked at it (+buffed) 2014-11-30 14:20:41 +01:00
Bernhard Bonigl 076b66be10 Merge branch 'master' into experimental 2014-11-30 14:04:39 +01:00
Bernhard Bonigl d089455063 Separate BlueSlime and King Slime into separate entities + baseclass 2014-11-29 23:02:23 +01:00
Bernhard Bonigl 345704f8dd Fix Material IMC Jagged being inverted 2014-11-28 15:06:20 +01:00
Bernhard Bonigl 5187f3bb31 Restore Tic-Tooltips compatibility so it doesn't crash anymore with new stuff 2014-11-28 14:37:49 +01:00
Bernhard Bonigl e47b570915 Merge branch 'master' into experimental 2014-11-26 22:37:25 +01:00
Bernhard Bonigl dc3a2b0ff7 Battlesigns now properly reflect all projectiles, not just arrows. 2014-11-26 22:37:08 +01:00
Bernhard Bonigl b861a114ca Allow Thaumometers to be added to travellers goggles.
1 Thaumometer = see nodes
2 Thaumometers = like the goggles of revealing
You can upgrade from 1 to 2 thaumometers.
2014-11-26 20:57:08 +01:00
Bernhard Bonigl 920edde7fd Force-enable all the modcompat plugins since they can be disabled by default if the mod wasn't present on config creation 2014-11-26 17:36:01 +01:00
Bernhard Bonigl 6ea64191e1 Merge branch 'master' into experimental 2014-11-25 21:45:57 +01:00
Bernhard Bonigl e1101fa412 Fix inventory desync when activating drying rack/basin/oreberry 2014-11-25 21:45:37 +01:00
Bernhard Bonigl 90e5d6af25 Remove special inventory-spawn-code in other blocks since it's handled by AbilityHelper now 2014-11-25 21:45:18 +01:00
Bernhard Bonigl 158ae52dd8 Fix OreBerry bushes not returning correct amount on leftclick 2014-11-25 21:43:29 +01:00
Bernhard Bonigl aa328792f7 Change AbilityHelper.spawnEntityAtPlayer to automatically put items into inventories by default (prevents lag-dupe) and also play sound if it got picked up. 2014-11-25 21:42:41 +01:00
Bernhard Bonigl 2a275c424e Merge branch 'master' into experimental 2014-11-23 23:11:31 +01:00
Bernhard Bonigl 6d677dcc7a Port the weird possible casting-block-dupe fix over to the drying rack #1190 2014-11-23 18:30:19 +01:00
Bernhard Bonigl 5fae9b7ced Thaumium Toolparts for weaponry 2014-11-22 23:21:11 +01:00
Bernhard Bonigl ce47cd3c96 Fix broken textures not getting colored correctly if a special head-texture is present, but not a broken one 2014-11-21 19:34:48 +01:00
Bernhard Bonigl 3c7d9f00dd Fix bows replacing the wrong texture when broken 2014-11-21 19:34:03 +01:00
Bernhard Bonigl 81da6633ed Fix broken bows being usable 2014-11-21 19:25:41 +01:00
Bernhard Bonigl eea8d165a4 Fix javelin not taking damage on attack if it was full and adding ammo. Oops. 2014-11-21 19:16:12 +01:00
Bernhard Bonigl 584c2e77f6 Add 'metal-part-creation-in-part-table' config to weaponry 2014-11-21 18:58:07 +01:00
Bernhard Bonigl 40a2e91943 Throwing knives now crit when they're aimed long enough 2014-11-21 18:50:04 +01:00
Bernhard Bonigl d57f8b64a8 Throwing knives windup is shorter and they nearly don't slow you down while doing so.
Also minimal javelin buff.
2014-11-21 18:27:33 +01:00
Bernhard Bonigl a44919a2f2 Shortbows give less slowdown while aiming 2014-11-21 18:26:39 +01:00
Bernhard Bonigl 8161d2b493 Adjust Thaumium bow-stats 2014-11-20 15:42:20 +01:00
Bernhard Bonigl 8687296199 Bring flamestring in line so it's an actual choice instead of just making normal tools lategame power. Also bring enchanted string in line a bit. 2014-11-20 15:40:21 +01:00
Bernhard Bonigl 2396c9c21c Prevent crash when hitting ghast-fireballs etc. with tinker projectiles 2014-11-20 15:06:16 +01:00
Bernhard Bonigl 9af43cbe9e Fix oredicted obsidian melting to 9 ingots instead of 2 2014-11-19 11:21:51 +01:00
Bernhard Bonigl 7372d0af89 Change quartz to be less effective on projectiles 2014-11-18 19:40:23 +01:00
Bernhard Bonigl 5d0a151947 The arrow material now has an impact on the breakchance of the arrow (head for arrow, head+core for bolt) 2014-11-18 19:05:28 +01:00
Bernhard Bonigl 69a40221d8 Some more tinkering with the bow values. Making materials more balanced against each other in their category. 2014-11-18 18:24:16 +01:00
Bernhard Bonigl b073a209f1 Fix repair-button not getting translated #1182 2014-11-18 10:20:06 +01:00
Bernhard Bonigl 811ad8739c Add bow and arrow stats to NEI for toolmaterials 2014-11-17 00:35:26 +01:00
Bernhard Bonigl 08bdb0789a Remove the resizing for perfect dodge and add a 10% chance to dodge projectiles instead 2014-11-16 23:45:45 +01:00
Bernhard Bonigl 7f87feaa0f Merge branch 'master' into weaponry 2014-11-16 23:29:05 +01:00
Bernhard Bonigl a56067bc50 Add a fix for chisels weird "imma change stone to only be harvestable by a chisel" thing. 2014-11-16 23:25:20 +01:00
Bernhard Bonigl 2d6c7f7367 Fix patternchest -> slab not keeping the inventory #1172 2014-11-16 23:13:55 +01:00
Bernhard Bonigl df64bc8197 Slab Pattern Chests now also keep their inventory! 2014-11-16 23:13:39 +01:00
Bernhard Bonigl 6b6928ec00 Fix slimy grass being harvestable without silk touch #1164 2014-11-16 22:09:24 +01:00
Bernhard Bonigl 16138a8cf3 10% crit chance for crossbows! 2014-11-16 21:58:25 +01:00
Bernhard Bonigl c5dff65efa Add fiery tooltip thingie to blaze arrows 2014-11-16 21:53:16 +01:00
Bernhard Bonigl 39206b231b Tweak bow material stats a bit 2014-11-16 21:44:39 +01:00
Bernhard Bonigl 86ef2cee0a Reduce the amount of modifiers to 2 on arrows/bolts 2014-11-16 21:42:04 +01:00