Commit Graph
1083 Commits
Author SHA1 Message Date
Bernhard Bonigl f3ba95bbea Prevent (x)bow crafting with invalid materials crash #1261 2014-12-26 09:12:18 +01:00
Bernhard Bonigl 6966d8c679 Prevent crashes with Non-Player-Entities shooting (or reflecting) tinkers arrows 2014-12-24 09:30:24 +01:00
Bernhard Bonigl 347ada6f5f Rudimentary Battlegear support (tinker weapons can be equipped like regular weapons) 2014-12-23 14:36:07 +01:00
Bernhard Bonigl ab329cd412 Fix base-durability for arrows and bolts not getting set correctly 2014-12-22 18:45:49 +01:00
Bernhard Bonigl fb2c2be1ac Kill the last missing instance of that player resizing stuff from dodge modifier 2014-12-22 14:09:54 +01:00
Bernhard Bonigl 224a3d45df Temporary fix for belts being activatable after death #1217
This does not solve the problem, only prevent the crash. It'll cause clientside desyncs until the belt is re-equipped.
2014-12-21 23:35:42 +01:00
Bernhard Bonigl 139b1fb1b0 Prevent ammo creation when missing information through old 3rd party materials is encountered instead of crashing #1236 2014-12-21 23:03:44 +01:00
Bernhard Bonigl 782d1e5df1 Fix crossbow checking body instead of string for enchanted bowstring #1237 2014-12-21 23:00:09 +01:00
Bernhard Bonigl 86b2bc0856 Fix non-ammo projectiles returning arrows instead of the projectile item. #1248 2014-12-21 22:31:31 +01:00
boni 3ccfc0a22a Merge pull request #1247 from asiekierka/stable
Make TinkerSmeltery optional, make the beginner book option apply to the smeltery/tool station books as well
2014-12-21 21:17:20 +01:00
asiekierka 8674272afa make TinkerSmeltery optional 2014-12-21 17:46:36 +01:00
Bernhard Bonigl f9819dcd10 Buff moss regeneration for projectiles 2014-12-19 14:12:29 +01:00
Bernhard Bonigl d11d844537 Fix ammo changing if the itemstack damage is set to the same damage as it already had #1231 2014-12-19 14:10:18 +01:00
Bernhard Bonigl 875aeb8b74 Fix moss/negative damage for javelins reducing ammo count #1229 2014-12-19 14:09:44 +01:00
Bernhard Bonigl 5422d3881a Fix Arrows/Bolts having hardcoded amount of modifiers, not respecting material traits like writeable. #1230 2014-12-18 22:19:22 +01:00
Bernhard Bonigl 581f1909cc Merge branch 'experimental' 2014-12-18 18:00:50 +01:00
Bernhard Bonigl 29caed2de7 Fix dependency checks for forge and mantle 2014-12-18 17:19:41 +01:00
Bernhard Bonigl f9067594e0 Fix arrows not hitting stuff after being deflected/damage rejected 2014-12-13 16:31:49 +01:00
Bernhard Bonigl da254927a6 Fix Thaumium toolparts for weaponry parts 2014-12-13 15:53:16 +01:00
Bernhard Bonigl d3c4ab0d0e Fix arrow stuff buttons being in the stencil table twice 2014-12-13 15:53:02 +01:00
Bernhard Bonigl 210fd2d8ff Merge branch 'master' into experimental 2014-12-07 21:55:06 +01:00
Bernhard Bonigl fcb4b1f0da Fix dupe bug with increasing smeltery size while gui is open. #1218 Additionally GUI now closes on smeltery size change, to prevent a crash when it's made smaller. And for consistency. 2014-12-07 21:54:34 +01:00
Bernhard Bonigl 6e3f6e1e5d Add a small tooltip to the seared tanks so they can be found when searching for 'smeltery' in NEI. 2014-12-07 21:24:38 +01:00
Bernhard Bonigl 633814d647 Fix reflected tinker projectiles not hitting stuff 2014-12-07 20:47:33 +01:00
Bernhard Bonigl a1bde95c36 Merge branch 'master' into experimental 2014-12-04 19:26:11 +01:00
Bernhard Bonigl 1941ddbf53 Fix liquid clicking for smelteries with 4-column GUI 2014-12-04 19:25:58 +01:00
Bernhard Bonigl ee9e2a3ca2 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-12-04 19:16:36 +01:00
Bernhard Bonigl f8a0520f35 Possible fix for the endless recursions that sometimes seem to happen with AOE tools. #1213 2014-12-04 19:16:14 +01:00
boni d4d859b71b Merge pull request #1203 from TheTemportalist/master
Fixed possible NPE
2014-12-04 16:14:05 +01:00
Bernhard Bonigl 43b1c35668 Merge branch 'master' into experimental 2014-12-03 21:30:51 +01:00
Bernhard Bonigl 855b58f01b Fix Tool Station allowing to rename anything #1211 2014-12-03 21:30:15 +01:00
Bernhard Bonigl d16acb6846 Tinker arrows/bolts/shuriken/throwingknives/javelins now work with dispensers :OOoo 2014-12-03 21:26:32 +01:00
Bernhard Bonigl 429c3b7fb7 Remove the dispenser behaviour for the old arrows 2014-12-03 20:58:07 +01:00
Bernhard Bonigl d2b06da1ec The piercing damage of arrows/bolts doesn't determine whether an entity has been hit anymore (since it always hits since it's unblockable) 2014-12-03 20:57:28 +01:00
Bernhard Bonigl 791fe9494f Fix lavatank canFill not respecting liquids in tank #1208 2014-12-03 10:40:08 +01:00
Bernhard Bonigl 011298e0b8 Experimenta: native FMP support for the bocks *sawsaw* 2014-12-02 21:34:31 +01:00
Bernhard Bonigl c4d9ebd505 Add a possibly missing rendering state reset 2014-12-02 21:03:01 +01:00
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
TheTemporatlist 5f725cb971 Fixed possible NPE 2014-11-28 13:26:32 -05: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