Commit Graph
2839 Commits
Author SHA1 Message Date
Adaptivity 933d5680c1 Added tooltips for manuals and fixed typo in cfg 2015-01-06 17:25:51 +03:00
Bernhard Bonigl c94fc4310f Work around FML crashing without UBC due to accessing the exception type in the UBC try-catch 2015-01-06 11:32:16 +01:00
Glassmaker 0972d78077 Adds UndergroundBiomes Construct support 2015-01-06 11:11:25 +01:00
boni b65c2a74db Merge pull request #1311 from Adaptivity/Localizemodifiers
Localization for modifiers
2015-01-05 20:07:07 +01:00
Adaptivity 435be0e314 Localization for modifiers 2015-01-05 15:13:19 +03:00
Bernhard Bonigl ed7e9dacb0 Another fix for the modifier localization hack. #4 2015-01-05 11:58:56 +01:00
Bernhard Bonigl 13ce4034a1 Another fix for the modifier localization hack. #3 2015-01-05 11:44:05 +01:00
Bernhard Bonigl ced1951f24 Another fix for the modifier localization hack. #2 2015-01-05 11:29:25 +01:00
Bernhard Bonigl 4badd85093 Another fix for the modifier localization hack. 2015-01-05 11:20:17 +01:00
Bernhard Bonigl 3dd9ee8591 Fix modifiers with X/Y not being localized in the toolstation properly 2015-01-05 11:00:43 +01:00
Bernhard Bonigl 722ba240fa Minor typo in IMC logging #1310 2015-01-05 09:13:52 +01:00
Bernhard Bonigl ed98476257 Fix stone shards with disabled stone using wood material. #1310 2015-01-05 09:13:40 +01:00
Bernhard Bonigl d408caba71 Change necrotic modifier to only heal on actually alive mobs. This prevents lifesteal from test dummies and similar things. 2015-01-05 00:16:57 +01:00
Bernhard Bonigl 724aa45b94 Fix all ISBR always returning true even when not rendering anything #1308 2015-01-04 23:49:08 +01:00
Bernhard Bonigl 752930af7b Re-Enable localization checks for modifiers to not doubly localize 2015-01-04 19:20:36 +01:00
Bernhard Bonigl a05badab0c Fix scythe checking wrong blocks for drops when using silktouch #1307 2015-01-04 19:19:41 +01:00
Bernhard Bonigl cacd93bf1a Fix reinforced MODIFIER display in the GUI getting overwritten by other modifiers 2015-01-03 18:37:03 +01:00
Bernhard Bonigl a5c76edf01 Hacky localization of all the modifiers in tooltips and GUI 2015-01-03 18:24:26 +01:00
boni 3c9bad7895 Merge pull request #1300 from squeek502/patch-4
Fix x.5 attack damage material stats getting shown as Full Durability in NEI
2015-01-02 23:48:33 +01:00
Ryan Liptak 277a94098d Fix plural attack damage material stats getting shown as Full Durability in NEI 2015-01-02 14:47:17 -08:00
Bernhard Bonigl dd4e165cb8 Add a config option to disable Tinker Villagers trading. They'll have normal villager trades then. #1291 2015-01-02 21:04:03 +01:00
boni 22e9f4928b Merge pull request #1299 from Adaptivity/targetLock
Small change to target lock
2015-01-02 19:11:27 +01:00
Adaptivity 311c2a3088 Ah 2015-01-02 20:57:58 +03:00
Adaptivity 9b514ad74a Small change to targetLock 2015-01-02 20:56:16 +03:00
Bernhard Bonigl f5f84afa76 Localize bane of pigs, infiminer 2015-01-02 15:44:32 +01:00
boni 6351d5399a Merge pull request #1298 from Adaptivity/Russianbooks
Russian localization for books
2015-01-02 15:12:31 +01:00
Adaptivity 1c110f039a Russian localization for books 2015-01-02 17:01:11 +03:00
boni 51f8ce1617 Merge pull request #1297 from Adaptivity/Localizearmor
Localize armor tooltips
2015-01-02 13:56:14 +01:00
Adaptivity 30d7b322bd Localize armor tooltips 2015-01-02 15:27:10 +03:00
Bernhard Bonigl 58db702878 Clean up Glass Arrows a bit #1296 2015-01-02 13:11:08 +01:00
Bernhard Bonigl 3bea7e5a07 Forgot to add the class for the alternate bolt recipe ;_; 2015-01-02 12:47:10 +01:00
Bernhard Bonigl 195dfc76f8 Add an alternative way to craft bolts with config (default off) #1295 2015-01-02 11:03:41 +01:00
Bernhard Bonigl 1a18389825 Pull hardcoded localizations stuff from books into .lang files, so we have at least one hacky way to have everything localized in the books. #1268 2015-01-01 23:13:47 +01:00
Bernhard Bonigl 28ccf1236e Remove crossbow ammo in case something invalid got loaded somehow (or through remappings) #1278 2015-01-01 22:19:15 +01:00
Bernhard Bonigl 4b4627c20d Better support for bolts being built dynamically over the API. 2015-01-01 21:47:24 +01:00
Bernhard Bonigl a2fd8a793e Change built Bolts in NEI always being iron tipped, like the bolt tool parts (and also remove the impossible combinations therefore) 2015-01-01 21:29:53 +01:00
boni f02f3a1670 Merge pull request #1283 from squeek502/fixes/arrow-shaft-name
Add CustomMaterial support to DynamicToolPart and add Arrow-Shaft localization
2015-01-01 21:20:20 +01:00
Bernhard Bonigl 6d7f751a53 Fix custom crosshair rendering screwing up possible other GUI elements (like boss health) #1286 2015-01-01 20:37:12 +01:00
boni 6c6e94793d Merge pull request #1280 from Adaptivity/TEsupportfix
Fixed missing TE names
2015-01-01 18:06:38 +01:00
Adaptivity ebfb98cf96 Small fix 2015-01-01 12:06:31 +03:00
squeek 1c80f926c2 Fix arrow shaft name / add CustomMaterial support to DynamicToolPart 2014-12-31 16:09:37 -08:00
Adaptivity 35b602a194 Fixed missing TE names 2014-12-31 20:53:35 +03:00
boni 90ef930f4b Merge pull request #1276 from squeek502/patch-2
Fix spaces being missing after some tool station GUI strings
2014-12-31 09:29:45 +01:00
Ryan Liptak e3a5a06904 Fix spaces being missing after some tool station GUI strings 2014-12-30 21:06:02 -08:00
Bernhard Bonigl dff21e9af3 Add IMC support for bow and arrow stats 2014-12-30 12:12:08 +01:00
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