Commit Graph
76 Commits
Author SHA1 Message Date
mDiyo 9ed8e6e9cd remove stray import 2013-09-18 20:30:24 -07:00
mDiyo f7b8f04b2e Move necrotic flag to AbilityHelper.java 2013-09-18 20:26:15 -07:00
mDiyo b4ae035547 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-18 19:46:26 -07:00
mDiyo fcaf3e7d7c Remove stray imports 2013-09-18 19:46:04 -07:00
Zach a379bf90e3 Merge pull request #196 from progwml6/master
update to 1.6.3 w/ new forge/mcp
2013-09-18 19:38:05 -07:00
Progwml6 0823a619cb update to 1.6.3 w/ new forge/mcp 2013-09-18 22:36:30 -04:00
mDiyo 6fec7f36b0 Move BowBase out of library 2013-09-18 18:55:25 -07:00
mDiyo db9046a4b9 Fix merge conflicts 2013-09-18 15:12:41 -07:00
mDiyo 1b9475d8d0 Gardeslime Disappear! 2013-09-18 15:10:37 -07:00
Arthur Uzulin be73c39bda Small tweaks to clear panes 2013-09-17 20:45:50 +10:00
Arthur Uzulin a94591818c ShouldSideBeRendered fix 2013-09-17 20:25:24 +10:00
Arthur Uzulin 0cbf8b2708 Work done on new pane renderer(WIP) 2013-09-17 20:00:54 +10:00
mDiyo 238a558fc6 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-16 23:43:34 -07:00
mDiyo 5fddacd0fc Add oredict support for wood slabs and sticks 2013-09-16 23:43:17 -07:00
progwml6 8d0172ea8f fix stupid merge nonsense 2013-09-15 22:47:32 -04:00
progwml6 f5882eef9e fix merge conflicts 2013-09-15 22:44:52 -04:00
progwml6 bfd999f05a fix merge conflicts 2013-09-15 22:41:24 -04:00
progwml6 ccf49b1e20 add option to not generate slime islands in dim 0 2013-09-15 22:33:57 -04:00
mDiyo e3b92c8857 Fix fluid icon registration, update version number to stable 2013-09-15 19:09:57 -07:00
Sunstrike 350f59ae5a Rebuild item throwing into smeltery feature (with config opt) 2013-09-15 17:01:56 +01:00
Zach 228349491f Merge pull request #182 from progwml6/master
removing unused EBXL API
2013-09-13 03:36:01 -07:00
Progwml6 412c5a37a6 removing unused EBXL API 2013-09-13 06:35:31 -04:00
Zach 9748b39441 Merge pull request #180 from Zerokyuuni/master
Mo' Tinker and Blade Craft
2013-09-13 03:10:47 -07:00
Progwml6 afe2d8657a fixed some bugs to prep for PR 2013-09-13 05:23:43 -04:00
Zerokyuuni d26e0bf6f2 Mo' Tinker and Blade Craft
Fixed Fryingpans causing slot hifting when in the off-hand, added a
config to allow hatchets to be used in the off-hand, and made Paladin
Steve happy by letting him use a shield alongside a Hammer
2013-09-13 00:09:00 -04:00
Progwml6 8e41fb6f43 Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-09-12 18:19:44 -04:00
Progwml6 f6018b668d adding in BOP Promised land support for slime islands -- generates island only no pool. code style cleanup 2013-09-12 18:19:21 -04:00
Sunstrike 5b3c6d1987 Fix Mine and Blade API (Remove Heraldry components) 2013-09-12 15:25:04 +01:00
Zerokyuuni 65b851c460 Tinker and Blade 2: Warconstruct 2013-09-12 14:34:27 +01:00
mDiyo cc43c2a493 Remove extra book recipe 2013-09-12 14:34:04 +01:00
GraxRabble 8c2a1c483c removed the hack and left only the vanilla leaf fix 2013-09-12 14:33:55 +01:00
GraxRabble bbeed32c56 Fixed leaf fletching dup 2013-09-12 14:33:50 +01:00
Progwml6 772846260e Merge branch 'master' of github.com:mDiyo/TinkersConstruct 2013-09-12 04:08:30 -04:00
Progwml6 8f4856c9af addition of blacklisting alloy and nether molten fluids in mystcraft ages via IMC NBT formatted messages 2013-09-12 03:44:15 -04:00
mDiyo 43ea5ff605 Remove extra book recipe 2013-09-11 12:14:42 -07:00
mDiyo 9722c0623f Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-11 11:54:14 -07:00
mDiyo 9b42cdd695 Fix Jerky stacking, adjust saturation 2013-09-11 11:53:45 -07:00
GraxRabble 7867bcd049 removed the hack and left only the vanilla leaf fix 2013-09-11 04:21:27 -04:00
GraxRabble 9e3830a50b Fixed leaf fletching dup 2013-09-10 22:52:28 -04:00
Arthur Uzulin 2fbad7bd7c Proper fix for the landmine dupe
Fixed landmine dupe
2013-09-09 21:27:13 +10:00
Arthur Uzulin d66182cb28 Temporary fix for landmine dupe
Temporarily fixed the landmine duplication, this fix is in no way within
my standards and will be looked into properly later.
2013-09-09 21:21:37 +10:00
mDiyo 09685b25e2 Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct 2013-09-08 22:41:57 -07:00
mDiyo 20cbb58021 More talky talky 2013-09-08 22:41:47 -07:00
Zach 154bf98b62 Merge pull request #168 from progwml6/master
fix bug with dimension blacklist check
2013-09-08 22:08:34 -07:00
Progwml6 1f6f7f2de5 fix bug with dimension blacklist check 2013-09-09 01:08:03 -04:00
Zach 17dfd0e45e Merge pull request #167 from progwml6/master
add config option to only generate slime islands in the overworld
2013-09-08 22:01:36 -07:00
Progwml6 8464d34e94 add config option to only generate slime islands in the overworld 2013-09-09 00:59:06 -04:00
Zach 48929c1bb0 Merge pull request #166 from progwml6/master
adding dimension blacklist for slime islands, including support for twilight forest via its configs, and other dimensions via TiC config
2013-09-08 21:29:23 -07:00
Progwml6 5b22f452aa fix bad initialization of slimeislanddimblacklist config 2013-09-09 00:27:33 -04:00
Progwml6 7e7266d4a0 add all negative dimensions to slime island blacklist 2013-09-08 23:45:52 -04:00