Commit Graph
2423 Commits
Author SHA1 Message Date
TheVikingWarrior de89c79be7 Update en_US.lang 2013-11-18 14:07:48 +01:00
TheVikingWarrior 031430359c Update de_DE.lang 2013-11-18 14:00:18 +01:00
TheVikingWarrior 3e21631fe0 Update it_IT.lang 2013-11-18 13:59:54 +01:00
progwml6 25a10a084d Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-18 02:51:31 -05:00
progwml6 80c91db7fe updated several missing flux textures, add abculater_2 to the credits list 2013-11-18 02:51:24 -05:00
Arthur Uzulin b6be3e87ff Achievement stuffs
- Implemented 'Dual Convenience' achievement
2013-11-18 18:11:31 +11:00
mDiyo 3ec1f4860f Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-17 22:51:13 -08:00
mDiyo 67e98ae38e Adjust casting channel speed 2013-11-17 22:50:34 -08:00
mDiyo d8f64c441c Fix Smeltery book 2013-11-17 22:48:35 -08:00
mDiyo 57a786c901 Merge pull request #332 from Squirrelly/master
Added in smeltery config options
2013-11-17 21:21:52 -08:00
Squirrely 7168935ac8 Fixed ingotsBronzeAlloy default value. 2013-11-17 23:19:14 -06:00
Squirrely 7ea5acea34 Removed ingotsPerOreNetherOreMod variable.
Since Nether Ores from the Nether Ores Mod always give 2x normal amount, config option was removed.
2013-11-17 23:00:15 -06:00
Squirrely 16ba4c9813 Added "smeltery output modification" config section.
Adds ability to customize ingot output of ores thrown into the smeltery and also the output of ingots when alloys are made.
2013-11-17 22:37:34 -06:00
Squirrely b52313ac73 Added difficulty config option vanillaSmelting. False by default.
Makes smeltery ingot return 1 for each ore.
Alloy output adjusted for equality to non modified version.
2013-11-17 20:18:23 -06:00
fuj1n 8fc5276650 Merge pull request #331 from TheVikingWarrior/patch-4
Update it_IT.lang
2013-11-17 13:55:54 -08:00
TheVikingWarrior 3f78d11a27 Update it_IT.lang 2013-11-17 16:35:06 +01:00
Arthur Uzulin edb8a1f79d More achievement stuffs
- Added 3 more achievements (+1 NYI)
2013-11-17 22:38:42 +11:00
Sunstrike 428d5fc002 Merge pull request #330 from TheVikingWarrior/patch-3
Update it_IT.lang
2013-11-17 03:37:27 -08:00
Sunstrike a28021cdda Add warning-shot to DragonAPI in EnvChecks. 2013-11-17 11:35:59 +00:00
Arthur Uzulin e6cfcfb70a More stuff on achievements
- Added an IInventory argument to ToolCraftedEvent
- Made Tool Forge also post the ToolCraftedEvent
- Added the Pro Tinkerer achievement as an advanced form of the Tinkerer
achievement
2013-11-17 21:21:45 +11:00
Arthur Uzulin 379d7d2da5 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-17 20:32:20 +11:00
Arthur Uzulin 82ffe30579 Achievement Prototype
- Added achievement system
- Added a few achievements(still working on ideas)
- Fixed an odd pixel on manyullyn pickaxe head
- Added an event for when the tool is *actually* crafted
2013-11-17 19:59:56 +11:00
mDiyo 6689052a19 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-17 00:55:24 -08:00
mDiyo 87263442f8 Dont check top slot when bottom isnt null 2013-11-17 00:48:20 -08:00
progwml6 7c26b9aee9 2nd npe fix 2013-11-17 03:47:55 -05:00
progwml6 bf8164882a npe fix 2013-11-17 03:32:18 -05:00
progwml6 db6ef8926e Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-17 03:13:32 -05:00
progwml6 a6ec407205 update TE compat code to work w/ beta versions 2013-11-17 03:13:26 -05:00
mDiyo 02be931131 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-17 00:07:33 -08:00
mDiyo 928f38e6d9 Alloys require ingot minimum values 2013-11-17 00:07:09 -08:00
TheVikingWarrior 574b3d9130 Update it_IT.lang 2013-11-17 09:04:04 +01:00
mDiyo c7ca9e3d6b Merge pull request #325 from TheVikingWarrior/patch-1
Deleted fluid.platinum , i'm not sure that it's ment to be there
2013-11-16 21:05:24 -08:00
mDiyo b633a98ee3 Merge pull request #312 from Samtrion/master
Added Recipes for 9 Ingots to Blocks
2013-11-16 21:05:13 -08:00
progwml6 b3d7807a37 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-16 23:58:13 -05:00
progwml6 e1137f177a remove plugins from mcmod.info, load after those mods. 2013-11-16 23:58:05 -05:00
mDiyo 543714b5d9 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-16 20:36:50 -08:00
mDiyo 87aef608d7 Blue slime tools can be made again 2013-11-16 20:36:00 -08:00
Zach f00b780872 Remove plugin mods from mcmod.info 2013-11-16 21:01:05 -05:00
Sunstrike 3589ccbc62 Burn @Mod Containers in righteous fire.
Implement a little more sensible plugin system, which interferes with the Mods list less.
2013-11-16 16:34:38 +00:00
Progwml6 8f530fb297 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2013-11-16 02:36:32 -05:00
Progwml6 ef64f67b33 update build file to reflect current dependencies, fix grammar errors 2013-11-16 02:36:15 -05:00
Zach fcf57f8650 Merge pull request #327 from TheVikingWarrior/patch-2
Update it_IT.lang
2013-11-15 23:04:26 -08:00
Zach 1a5b7703c6 Merge pull request #324 from Vexatos/patch-2
Update de_DE.lang
2013-11-15 23:04:20 -08:00
Sunstrike 11697b62b0 Fix build file
Whoops, I'm awful at this x)
2013-11-15 21:40:33 +00:00
Sunstrike 2dd7dce44d Unfux build.xml
Remove prog-grammar, rearrange targets/Forge checks into correct order, fix pack-dev, make pack-dev independant of pack-api, convert all whitespace to spaces...
2013-11-15 19:06:30 +00:00
TheVikingWarrior f9802efaf7 Update it_IT.lang 2013-11-15 14:30:35 +01:00
Sunstrike 5b463f2d9c Update build.xml
Change name of Deobf jars (fix yer grammar! Also cleaner.) - More work to come (cleaning up whitespace mostly)
2013-11-15 12:56:10 +00:00
progwml6 09c9f65e95 addition of dev jars at diyo's request 2013-11-15 02:54:24 -05:00
Progwml6 cbe1698d56 remove mantle dependency 2013-11-14 23:47:28 -05:00
mDiyo 13eb37df99 Tools can throw splash potions 2013-11-14 14:26:37 -08:00