TheVikingWarrior
4b40d9704b
Update it_IT.lang
2013-11-20 22:29:46 +01:00
mDiyo
d16e7305c0
Null check for death event
2013-11-19 21:57:09 -08:00
mDiyo
7a8836adae
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2013-11-19 20:58:36 -08:00
mDiyo
af470c518f
Add pigiron, fix event crash
2013-11-19 20:57:52 -08:00
Zach
d7b17f5e87
Merge pull request #337 from Vexatos/patch-3
...
Update de_DE.lang
2013-11-19 10:58:08 -08:00
Zach
4d954a51cc
Merge pull request #338 from TheVikingWarrior/patch-2
...
Update it_IT.lang
2013-11-19 10:57:57 -08:00
TheVikingWarrior
5ac3766474
Update it_IT.lang
2013-11-19 16:57:00 +01:00
Progwml6
1168f0d280
Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct
2013-11-19 03:23:57 -05:00
Progwml6
8e876bf90a
prevent dupe glitch
2013-11-19 03:23:51 -05:00
Vexatos
a44a36605b
Update de_DE.lang
2013-11-19 07:28:55 +01:00
mDiyo
413a86f329
New tooltip for seared tanks
2013-11-18 22:23:02 -08:00
mDiyo
4d46f950d8
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2013-11-18 19:30:17 -08:00
mDiyo
7a50910c86
Molten platinum needs icons
2013-11-18 19:30:10 -08:00
fuj1n
8668b91ac5
Merge pull request #334 from Vexatos/patch-2
...
Update de_DE.lang
2013-11-18 13:52:31 -08:00
Vexatos
4e19bcd3d5
Oops.
2013-11-18 17:12:44 +01:00
Vexatos
6cbab9c76b
Sorry for the delay...
...
Someone in my school decided to shutdown my PC while I was translating this file, @fuj1n
2013-11-18 17:11:28 +01:00
Zach
cdd2fc4859
Merge pull request #333 from TheVikingWarrior/patch-4
...
Frying Pan Localization
2013-11-18 07:24:29 -08:00
TheVikingWarrior
012200dbc4
Update zh_CN.lang
2013-11-18 14:14:57 +01:00
TheVikingWarrior
a104045f18
Update it_IT.lang
2013-11-18 14:10:32 +01:00
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