Commit Graph
377 Commits
Author SHA1 Message Date
warlordjones 940b98bed8 Reimplementing Warning Signs & Torches 2015-01-11 12:03:19 +00:00
Arona Jones 3b626713ab Merge pull request #131 from TheCricket/dev
Update Revert Branch
2015-01-11 11:53:49 +00:00
Drullkus e741a7e43d #Blame Derpkus 2015-01-10 17:18:23 -08:00
tterrag1098 ab12b7046e Forgot to register diamond chisel renderer 2015-01-10 18:53:42 -05:00
tterrag1098 f6e5af6788 Add Drullkus changes 2015-01-10 17:28:25 -05:00
tterrag1098 2259ecfba4 Move all block registration to preinit to prevent creative tab issues 2015-01-10 17:21:16 -05:00
warlordjones 46ddb61b72 Stop the mod tab crashing 2015-01-10 21:09:20 +00:00
warlordjones 6864c21922 Fix the broken tab icon for the Wood Tab 2015-01-10 20:37:38 +00:00
tterrag1098 7572350801 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-10 15:29:44 -05:00
tterrag1098 a357294195 Fix no modded blocks loading 2015-01-10 15:29:37 -05:00
Cricket 73c975a164 Merge pull request #126 from warlordjones/master
Quite a number of Language Fixes/Improvements
2015-01-10 11:29:52 -08:00
Arona Jones 160d646d6f Desc improvements for Tyrian 2015-01-10 18:24:39 +00:00
Arona Jones 81828158b2 Fix the errant space in Voidstone pillar names 2015-01-10 18:19:09 +00:00
Arona Jones 5c7a0fd174 Fix two of the limestone blocks having the same description 2015-01-10 18:02:55 +00:00
Arona Jones 9abea66c56 Add "planks" to the wood plank names 2015-01-10 17:51:00 +00:00
Arona Jones b103c8cb49 Bookshelf desc improvements 2015-01-10 17:46:42 +00:00
Arona Jones b7979a3ad2 Consistency edit 2015-01-10 17:36:10 +00:00
Arona Jones 0e4aa109a1 Some factory block description improvements 2015-01-10 17:35:49 +00:00
Arona Jones ec39f3e7aa Some Grim/Holystone language fixes 2015-01-10 17:34:13 +00:00
Arona Jones 24a719d7c9 Fix some fantasy block descriptions 2015-01-10 17:32:23 +00:00
Arona Jones 650bb81dc2 Replace all instances of 'weared' with 'worn' 2015-01-10 17:31:15 +00:00
tterrag1098 f12dc9e69e Reverse render order of glow block textures 2015-01-10 05:26:35 -05:00
tterrag1098 ea0740aab5 Add null check for block 2015-01-10 04:51:48 -05:00
tterrag1098 cce5e65b08 Add new variation compat. Mostly untested. 2015-01-10 04:39:10 -05:00
tterrag1098 dd6b4aed88 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-10 04:22:09 -05:00
tterrag1098 651d258b38 Remove hardcoded chisel item check in autochisel, change to IChiselItem 2015-01-10 04:22:03 -05:00
Drullkus fe1c19d985 HEx Anim 2015-01-09 23:43:02 -08:00
tterrag1098 313c24646c Auto chisel upgrades should be dependant on the auto chisel feature 2015-01-09 22:14:35 -05:00
tterrag1098 a9cd1a1131 Fix autochisel being broken when time is stopped 2015-01-09 10:58:01 -05:00
tterrag1098 e0afcbf946 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-09 09:18:17 -05:00
tterrag1098 dffbebbe88 Improve diamond chisel texture 2015-01-09 09:18:11 -05:00
Cricket 2d0ef19f07 It bothered me(2/2) 2015-01-09 05:25:44 -08:00
Cricket e105e2392d It bothered me(1/2) 2015-01-09 05:24:26 -08:00
tterrag1098 5486eded3f Fix not being able to shift click into main inventory from autochisel 2015-01-09 08:08:21 -05:00
tterrag1098 fc0cac8b67 Add a partial fix for #119 2015-01-09 07:11:41 -05:00
tterrag1098 8a9d46bc3a Remove debug spam 2015-01-09 05:50:29 -05:00
tterrag1098 ee81272593 Fixes #109 Shift clicking not working in auto chisel 2015-01-09 05:40:30 -05:00
tterrag1098 c2eae121bc Change ironChiselCanLeftClick default to true 2015-01-09 03:04:39 -05:00
tterrag1098 8f9cc76bd5 Add config option for left click chiseling. Fix chisel recipes. 2015-01-09 03:03:37 -05:00
tterrag1098 876f7492e8 Add some TODOs for others 2015-01-09 02:38:24 -05:00
tterrag1098 047df88793 Further simplify IChiselItem and improve chisel tooltips 2015-01-09 02:33:03 -05:00
tterrag1098 25dc76a739 Revert Futura change for now 2015-01-09 02:09:22 -05:00
tterrag1098 2f6adfc996 Add missing files from last commit 2015-01-09 01:51:52 -05:00
tterrag1098 8bc563b6b7 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-09 01:50:41 -05:00
tterrag1098 71e839831f Chisel item refactor.
Add chisel slot to autochisel. 
Refactor slot tooltip and valid items.
2015-01-09 01:50:32 -05:00
CptSpaceToaster df73373b94 Was anyone using this? I'm using this now. Beginning steps for Antiblocks 2015-01-09 01:33:03 -05:00
CptSpaceToaster a00a20e607 brightned hex-plating 2015-01-09 00:44:33 -05:00
tterrag1098 17629d0182 Merge pull request #115 from matthewprenger/master
Update gradle wrapper
2015-01-09 00:25:25 -05:00
matthewprenger 7f7c533e5e Update gradle wrapper 2015-01-08 23:22:32 -06:00
Drullkus 9e928fd788 Merge remote-tracking branch 'origin/master' 2015-01-08 20:09:34 -08:00