upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
401 Commits 5 Branches 98 Tags
1ec6bfddbe7bf15480abe600bcc75d4d141dccc5
Commit Graph
401 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Drullkus 1ec6bfddbe Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:21:40 -08:00
Drullkus c6ba978819 ??? 2015-01-11 13:21:05 -08:00
warlordjones cac6fa70c1 Implement more road lines - Double White, Yellow and Double Yellow 2015-01-11 21:19:33 +00:00
Drullkus a75a5d8be8 Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:19:30 -08:00
Drullkus 133b3262b2 Add Poptart Rainbow, push files around 2015-01-11 13:18:53 -08:00
warlordjones 9d868864f9 Import Organisation 2015-01-11 20:59:16 +00:00
warlordjones 941bf49f7d Fix what the Road Line pr broke 2015-01-11 20:58:14 +00:00
warlordjones 8ab7e53f28 Redo changes to 'Chisel.java' from my branch 2015-01-11 20:56:07 +00:00
Arona Jones 83d3f7e0a9 Merge branch 'revert' into dev 2015-01-11 20:54:24 +00:00
Cricket 8321be7a5e Merge pull request #134 from Mitchellbrine/patch-1 
Added the tool required to break road lines (Fixes #78)
 2015-01-11 12:51:10 -08:00
warlordjones dc0f02c350 Lang for Blood Rune Blocks 2015-01-11 20:29:41 +00:00
warlordjones 61b0135715 Fix the Blood Magic Blank Rune compat blocks 2015-01-11 20:25:34 +00:00
warlordjones 2e357881cf Fix more derping... 2015-01-11 19:48:43 +00:00
Mitchellbrine c099172e6f Implemented the config options into the RoadLines 
Using a tool is disabled by default and the tool and tool harvest level can be changed in the config
 2015-01-11 11:45:00 -08:00
Mitchellbrine 4fafbc7371 Added the config options for the road lines in Configurations 2015-01-11 11:42:50 -08:00
warlordjones fac1042c02 I r a stupid. #Blame Derpjones 2015-01-11 19:41:41 +00:00
warlordjones e9fb9409ac Fix #133 
Also refactor BlockLightstoneCarvable to BlockCarvableGlowstone (Consistency)
 2015-01-11 19:40:35 +00:00
Mitchellbrine 4f427aa0ca Added the tool required to break road lines 
Set it as a wood pickaxe. Still breaks instantly, but it cannot be broken in Adventure Mode. Can be configured to any tool you desire (except shears, in which case, just make it implement IShearable).
 2015-01-11 11:28:24 -08:00
warlordjones 75203c3c3d Some Thaumium Block concepts 2015-01-11 19:26:21 +00:00
warlordjones 01c4f193ce Add the thaumcraft textures to the folders, for easy location when making textures 2015-01-11 19:07:56 +00:00
warlordjones ae830fc1f5 Setup basic infrastructure for Chiselable Thaumium, Tallow and Amber 2015-01-11 19:03:34 +00:00
warlordjones da3a73f393 Make BlockCarvableGlow emit light at the same level as a redstone torch 2015-01-11 18:34:08 +00:00
warlordjones 749254ef02 More work at underping the warning sign lighting 2015-01-11 14:17:35 +00:00
warlordjones a0acbef0d5 Rework the warning sign background texture. 
Also prevent lightbulbs smoking (it was bad for their health)
 2015-01-11 13:36:13 +00:00
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