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,794 Commits 6 Branches 324 Tags
0d338eafef5794de09ed55e5c94c3996a6ab7494
Commit Graph
2794 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernhard Bonigl 0d338eafef Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-12-30 11:30:22 +01:00
Bernhard Bonigl 8c34b3ea71 Fix drying racks/oreberries etc. not syncing inventory on pickup 2014-12-30 10:58:48 +01:00
boni f6f22b5eea Merge pull request #1273 from squeek502/patch-1 
Fix unsafe getCompoundTag call in PotionLauncher.getItemUseAction
 2014-12-30 09:25:17 +01:00
Ryan Liptak 0d388bef52 Fix unsafe getCompoundTag call in PotionLauncher.getItemUseAction 
* See squeek502/AppleCore#9
 2014-12-29 22:10:09 -08:00
Bernhard Bonigl c46e6e0bc2 Fix an issue with default tool-callback-modifiers resetting other modifiers damage (e.g. useless smite/bane) 2014-12-29 19:42:19 +01:00
boni 2f4ea07f98 Merge pull request #1269 from Adaptivity/Update 
Some fixes
 2014-12-28 17:20:05 +01:00
Adaptivity 6e8d567d58 Some fixes 2014-12-28 18:55:19 +03:00
boni 8560cb23e0 Merge pull request #1266 from asiekierka/stable 
fix Tinkers Weaponry book spawning with beginner book option off
 2014-12-28 00:43:55 +01:00
asiekierka 40c977fb39 fix Tinkers Weaponry book spawning with beginner book option off 2014-12-28 01:09:52 +01:00
Bernhard Bonigl 34e5f90edd Prevent possible crash in bows 2014-12-27 22:19:36 +01:00
Bernhard Bonigl 4f97051249 Fix weaponry throwing exceptions if smeltery isn't present 2014-12-27 22:19:22 +01:00
boni 2f2a929fab Merge pull request #1264 from NatsuArashi/patch-1 
Create zh_TW.lang
 2014-12-26 20:06:03 +01:00
NatsuArashi e66274b431 Create zh_TW.lang 
From zh_CN
 2014-12-26 21:59:41 +08:00
Bernhard Bonigl a9f9cbf108 Oredict metal integration if metal part crafting is enabled 2014-12-26 12:01:39 +01:00
Bernhard Bonigl 8c96a119a1 Fix rendering sometimes crashing because of not initialized engine for some reason. 2014-12-26 11:56:27 +01:00
Bernhard Bonigl 0f1a4582af Possible fix for crossbow rendering crashing on server login. This might happen because of the crossbow rendering before the necessary NBT is loaded.... if that's even possible #1254 2014-12-26 11:13:20 +01:00
Bernhard Bonigl 384fe28be9 Some additional checks to prevent crashes for invalid/incomplete arrow entities #1262 2014-12-26 11:06:00 +01:00
Bernhard Bonigl 161c292462 Prevent the creation of useless tool parts (bow limb, xbow limb and arrowhead without respective stats for the material) 2014-12-26 11:03:28 +01:00
Bernhard Bonigl f3ba95bbea Prevent (x)bow crafting with invalid materials crash #1261 2014-12-26 09:12:18 +01:00
Bernhard Bonigl 7eadf0df54 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-12-24 09:30:49 +01:00
Bernhard Bonigl 6966d8c679 Prevent crashes with Non-Player-Entities shooting (or reflecting) tinkers arrows 2014-12-24 09:30:24 +01:00
boni b32b12d6e5 Merge pull request #1257 from Adaptivity/patch-3 
Update ru_RU.lang
 2014-12-24 09:21:18 +01:00
Anton 1886267e59 Update en_US.lang 2014-12-23 21:53:31 +03:00
Anton e201045c5d Update ru_RU.lang 2014-12-23 21:52:54 +03:00
Bernhard Bonigl b74ab52f34 Update version to 1.8.1 1.8.1 2014-12-23 14:53:30 +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 216be9ca2b Better contrast for the bolts 2014-12-23 11:48:01 +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
fuj1n e14517535d Update materials.xml 
Added the Shift+Right-click info for battlesign
 2014-12-20 13:40:26 +11: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 bd0fb35aae Update mantle to a version with the required version number (no content change, only version number changed) 2014-12-18 22:18:44 +01:00
Bernhard Bonigl e5aa007781 Remove the old idea/todo file since it's not relevant anymore 2014-12-18 18:04:48 +01:00
Bernhard Bonigl 8086c255e2 Update Mod Version to 1.8.0 (not to be confused with MC version 1.8) to welcome weaponry 2014-12-18 18:03:05 +01:00
Bernhard Bonigl 581f1909cc Merge branch 'experimental' 1.8.0 2014-12-18 18:00:50 +01:00
Bernhard Bonigl 29caed2de7 Fix dependency checks for forge and mantle 1.7.1d 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