Glassmaker
0f0af93d1a
Fixes idle bow sprite
2014-07-14 01:54:03 +03:00
mDiyo
0cbed171bb
Merge pull request #737 from Sunstrike/patch-2
...
Update build.gradle
2014-07-13 08:12:25 -08:00
Aeranan
8b8293fc64
Update build.gradle
...
Add source jar generation as an option.
Useful for Mavenisation, when TCon is just referred to by a Maven dependency. This attaches clean sources without decompiling or checking out from Git.
2014-07-13 15:25:07 +01:00
mDiyo
af27bcdada
Merge pull request #736 from Glassmaker/patch-villagerTrade
...
Fixed villager trade crash
2014-07-13 05:54:00 -08:00
Glassmaker
84744e0404
Shifts villager initializaion after pulsar's preinit, fixes crash on opening villager trade window, closes #719
2014-07-13 13:58:04 +03:00
mDiyo
b6d8e1fd31
Merge pull request #730 from Glassmaker/patch-4
...
Fixed Localizations in Smeltery Tooltip and WAILA
2014-07-12 10:02:05 -08:00
mDiyo
1affd6d909
Merge pull request #724 from squeek502/1.7.10-merge-1.6.4
...
Merge some unmerged pull requests from 1.6.4 branch
2014-07-12 10:01:35 -08:00
Glassmaker
46fbe04920
Fixed Localizations in Smeltery Tooltip and WAILA
2014-07-10 13:23:31 +03:00
mDiyo
126a9c6baa
Merge pull request #726 from 61352151511/master
...
Fix typo in "keybindings" variable
2014-07-08 20:27:47 -08:00
Alexander Behrhof
341848029a
Updating CodeChicken Mods to 1.7.10
2014-07-07 18:39:43 -04:00
61352151511
aff7fe4160
Fix tconstruct.keybindings variable in ru_RU.lang
2014-07-07 07:27:03 -03:00
61352151511
9b886a14ca
Fix tconstruct.keybindings variable in it_IT.lang
2014-07-07 07:26:28 -03:00
61352151511
c1d07bf1ca
Add tconstruct.keybindings variable in de_DE.lang
2014-07-07 07:25:48 -03:00
61352151511
d2218f6dbd
Fix tconstruct.keybindings variable in en_US.lang
2014-07-07 07:24:01 -03:00
squeek
4a8ca08fac
Compile fixes for 1.7.10
2014-07-07 00:16:47 -07:00
squeek
7afb01afb3
Fixed the ammo tooltip damage string and give a name to placed frying pans
...
Conflicts:
resources/assets/tinker/lang/en_US.lang
2014-07-07 00:07:14 -07:00
mDiyo
ac50689102
Multibugfix
2014-07-06 22:59:44 -08:00
squeek
443757c28c
Fixed multiple repairs being more effective than a single repair with the same amount of materials
...
Fixes SlimeKnights/TinkersConstruct#584
2014-07-06 23:57:54 -07:00
squeek
4fce1a924e
Fixed repairing only working with the first 2 crafting slots (it will now work with any slot).
...
Fixes SlimeKnights/TinkersConstruct/#568
2014-07-06 23:57:52 -07:00
squeek
8075cb0b9e
Safer tile entity casting in SearedBlock.getCollisionBoundingBoxFromPool
...
Fixes SlimeKnights/TinkersConstruct#586 and SlimeKnights/TinkersConstruct#557
Conflicts:
src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
2014-07-06 23:57:50 -07:00
squeek
9b2784719b
Made slab furnaces accept items with the same restrictions as normal furnaces
...
* Duplicated ISidedInventory implementation of TileEntityFurnace
Fixes SlimeKnights/TinkersConstruct#573
Conflicts:
src/main/java/tconstruct/tools/logic/FurnaceLogic.java
2014-07-06 23:57:03 -07:00
squeek
d719885de7
Fixed some inconsistencies in how damage/speed of tools is calculated in GUIs
...
* Fixed damage not being calculated properly in Crafting Stations
* Fixed Crafting Stations stonebound speed calculations (they were using a different algorithm)
* Fixed typo that made GUIs show the primary mining speed of dual harvest twice
* Fixed Stonebound damage bonus/loss always being truncated to an int in GUIs
Conflicts:
src/main/java/tconstruct/tools/gui/CraftingStationGui.java
src/main/java/tconstruct/tools/gui/ToolStationGui.java
2014-07-06 23:53:35 -07:00
mDiyo
6f7f464371
Merge pull request #722 from Mrkwtkr/patch-1
...
Update zh_CN.lang
2014-07-06 22:37:21 -08:00
mDiyo
39914c00e6
Merge pull request #723 from portablejim/smelteryMetaFix
...
Fix metadata for block->render mapping in smeltery.
2014-07-06 22:37:14 -08:00
James McKay
4576e9653d
Fix metadata for block->render mapping in smeltery.
2014-07-07 15:57:29 +10:00
Mrkwtkr
ead4df1bad
Update zh_CN.lang
...
I found that this file haven't been updated for a long time(serval months the last time). So I updated it. Add something that was lost and fix something.(The en_US.lang I contrasted is for mc 1.7.10) I'll keep translating new stuff in the future, thank u :D
2014-07-06 23:40:06 +08:00
mDiyo
41ff78b75c
Merge pull request #714 from Adaptivity/patch-2
...
Update ru_RU.lang
2014-07-06 00:44:54 -08:00
mDiyo
9ebdad49b2
Travel gear recipes
2014-07-06 00:43:16 -08:00
mDiyo
02de4ab205
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2014-07-05 22:07:05 -08:00
mDiyo
db85c10aac
Fix various bugs, switch creative tabs to self-contained version
2014-07-05 22:06:38 -08:00
mDiyo
db0a533d67
Merge pull request #717 from TheVikingWarrior/patch-9
...
Italian localization for 1.7.10 and key localization
2014-07-05 21:10:27 -08:00
mDiyo
2629e241cd
Finish updating slot logic for Tool Stations, fix dupe bugs
2014-07-05 21:08:58 -08:00
TheVikingWarrior
63d38405f0
Update it_IT.lang
2014-07-05 14:33:54 +02:00
Anton
dfed93d193
Update ru_RU.lang
2014-07-04 18:37:52 +04:00
TheVikingWarrior
a6707630e5
Key localizationa
...
Key localizationa, as mentioned in https://github.com/SlimeKnights/TinkersConstruct/issues/715
2014-07-04 16:10:05 +02:00
TheVikingWarrior
49f5396eb3
Update it_IT.lang
2014-07-04 16:01:43 +02:00
Anton
2ffc64b5ff
Update ru_RU.lang
2014-07-04 09:58:43 +04:00
mDiyo
c16c376868
Default instantiation for centerPos in SmelteryLogic
2014-07-03 18:23:19 -08:00
mDiyo
601c1b898c
Fix casting tables and basins not having recipes
2014-07-03 18:00:24 -08:00
mDiyo
4236d537b0
Update lang file
2014-07-03 16:15:36 -08:00
mDiyo
2bb35b18e0
Finish armor porting
2014-07-03 16:11:54 -08:00
mDiyo
c13c8f8050
Fix armor rendering, start armor abilities
2014-07-02 23:37:28 -08:00
mDiyo
541a91432c
Split TProxyClient into module proxies
2014-07-02 21:00:57 -08:00
mDiyo
625118f062
Proxies run on initialize instead of constructors
2014-07-02 20:27:32 -08:00
mDiyo
741a439a13
Merge pull request #711 from progwml6/master
...
Use auto-Forge config for modules
2014-07-02 17:15:01 -08:00
progwml6
a5d7260c1f
update mantle, autogenerate the configs for pulsar modules
2014-07-02 21:10:56 -04:00
mDiyo
7ecd97ad8f
Update the way modules are loaded
2014-07-01 23:23:15 -08:00
mDiyo
c525493545
Update modifiers, start travellers gear
2014-06-30 22:26:00 -08:00
mDiyo
0230307f0a
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2014-06-30 19:00:12 -08:00
mDiyo
c79ddf869c
Change FluidType to a more appropriate class
2014-06-30 18:59:13 -08:00