mDiyo
f12a073153
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2013-12-19 08:12:47 -08:00
mDiyo
1b1803c48b
Add incompatibles to EnvironmentChecks
2013-12-19 08:12:02 -08:00
Progwml6
c828a046d1
re-organize some of the plugins to different packages
2013-12-19 10:10:10 -05:00
Progwml6
48220202bc
use mantle's craftingItem
2013-12-19 10:05:01 -05:00
Progwml6
51e0833ae8
part 2 of conversion to multiItemBlock
2013-12-19 08:15:16 -05:00
Sunstrike
2ed4c115e4
Actually update UU value.
2013-12-19 13:03:16 +00:00
Sunstrike
2fbeb7f516
Update IC2 plugin.
...
Adjust liquid value for dirt-to-diamonds, remove all other UU recipes.
2013-12-19 13:02:19 +00:00
Progwml6
d65baaecb0
part 1 of converting to using MultiItemBlock where appropriate
2013-12-19 06:32:54 -05:00
Zach
dcd19499bb
Merge pull request #388 from crafteverywhere/patch-4
...
Update zh_CN.lang
2013-12-18 10:11:23 -08:00
crafteverywhere
8e4fdcbb3a
Update zh_CN.lang
2013-12-18 23:57:53 +08:00
Arthur Uzulin
f84004c409
Added achievement "Better Crafting"
...
- Added the achievement called "Better Crafting"
2013-12-19 01:48:06 +11:00
fuj1n
37331549a5
Merge pull request #387 from VeryBigBro/patch-1
...
Update ru_RU.lang
2013-12-18 06:00:59 -08:00
Anton
79bf811c8d
Update ru_RU.lang
2013-12-18 16:58:13 +03:00
Zach
7d4625a41d
add RF to shortbow
2013-12-17 01:29:30 -05:00
Zach
a8af8648c9
Merge pull request #386 from Vexatos/patch-2
...
Update de_DE.lang
2013-12-16 22:19:28 -08:00
Vexatos
a8f16e2d93
Update en_US.lang
2013-12-17 07:10:35 +01:00
Vexatos
32d325a2c8
Update de_DE.lang
2013-12-17 07:10:10 +01:00
Progwml6
8fa0894c70
get rid of all recipes with natural aluminum, replace with aluminum ingots
2013-12-16 03:40:26 -05:00
mDiyo
951ce40ac1
Update capes.txt
2013-12-15 20:43:51 -08:00
Sunstrike
fab3908afd
Merge pull request #383 from iguanaman/1.6.4
...
Allow more creative builder message suppression
2013-12-15 13:40:53 -08:00
iguana_man
2e025763c7
Allow more creative builder message suppression
2013-12-16 04:47:35 +09:00
Sunstrike
55876efd4e
Merge pull request #381 from crafteverywhere/patch-4
...
Update zh_CN.lang
2013-12-15 04:49:36 -08:00
crafteverywhere
d5c7e1e7de
Update zh_CN.lang
2013-12-15 20:46:51 +08:00
Progwml6
7dade36215
more manual movement work
2013-12-14 21:27:37 -05:00
mDiyo
ea17087fb4
Remove FoV modifier
2013-12-14 15:37:11 -08:00
Zach
be333cace0
Merge pull request #380 from Vexatos/patch-2
...
Mmmmmhm tasssssssty.
2013-12-14 10:45:58 -08:00
Arthur Uzulin
5694517f3d
New achievement
...
- Added two new events related to smeltery
- Added a new secret achievement labelled "Doing it Wrong"
2013-12-15 02:56:34 +11:00
Vexatos
dbb8856a5f
Update de_DE.lang
2013-12-14 13:58:01 +01:00
Progwml6
049f8f44a5
more cleanups of manual move
2013-12-14 01:21:21 -05:00
Progwml6
f066189788
use TCon crafting station not vanilla crafting table in villages
2013-12-14 01:05:56 -05:00
Progwml6
3e4302c586
Move part of book code to mantle
2013-12-13 23:14:46 -05:00
Arthur Uzulin
f8450e4a31
Knapsack/extended slots tick updates
...
- Fixed a null pointer exception
- Clean up imports in GlassBlock(accidental)
- Made the extended armor slots tick and armor tick items
- Made the knapsack tick items
2013-12-14 14:11:41 +11:00
Progwml6
22c99c80dd
clean up some debugging messages
2013-12-13 20:57:05 -05:00
Progwml6
b5ec714f76
once again another deleted nei version from CB
2013-12-13 16:32:01 -05:00
Sunstrike
014ca12959
Update NEI as CB has deleted it... again...
2013-12-13 21:18:39 +00:00
Progwml6
931b2bd799
make recipe variable in tconstruct that is static, remove static calls on methods in trecipes
2013-12-13 16:07:26 -05:00
mDiyo
90f09b7e2d
First armor modifier
2013-12-12 21:05:26 -08:00
mDiyo
8b154a9cb4
All modifiers changed to use the tinker table
2013-12-12 14:21:30 -08:00
mDiyo
50fdf1b161
Fix filter amounts
2013-12-12 03:22:27 -08:00
mDiyo
30e51d33aa
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
2013-12-12 03:08:40 -08:00
mDiyo
086cc97ddc
Rewrote ModAttack to accept multiple items
2013-12-12 03:08:05 -08:00
Progwml6
55eeaf1561
clean up old stuff, bump required version to 1.6.4 in master as a result
2013-12-12 03:30:41 -05:00
Progwml6
00b763cc0d
update to forge 953 to handle mojang's repo changes
2013-12-12 01:23:05 -05:00
mDiyo
977287e440
Crafting Station can modify tools if near a Tool Station
2013-12-11 22:10:57 -08:00
Zach
1213c69022
update to new NEI as old build was removed from CB's server
2013-12-12 00:30:38 -05:00
Progwml6
faedd83413
fix manual merge derps
2013-12-12 00:13:21 -05:00
Progwml6
0c9c8100ad
manual merges of up to 9a578fc
2013-12-11 23:47:07 -05:00
Progwml6
655780cc0c
nether smeltery coming to a master branch near you
2013-12-11 22:55:31 -05:00
Sunstrike
66024ff652
Update NEI dep as CB removed the old one, breaking the build.
2013-12-11 22:26:04 +00:00
Sunstrike
cc80c0a187
Update build.gradle.
...
Cleanup formatting and comments, remove legacy Minecraft libraries download repo.
2013-12-11 21:56:32 +00:00