Commit Graph
247 Commits
Author SHA1 Message Date
Drullkus d86177347c Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:19:30 -08:00
Drullkus b26ddfd019 Add Poptart Rainbow, push files around 2015-01-11 13:18:53 -08:00
Arona Jones 8bf352ee82 Merge branch 'revert' into dev 2015-01-11 20:54:24 +00:00
warlordjones 6589c1b881 Lang for Blood Rune Blocks 2015-01-11 20:29:41 +00:00
warlordjones 8f64cd7d61 Some Thaumium Block concepts 2015-01-11 19:26:21 +00:00
warlordjones f603757af2 Add the thaumcraft textures to the folders, for easy location when making textures 2015-01-11 19:07:56 +00:00
warlordjones f9e18f3f95 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 bb2492aa21 Reimplementing Warning Signs & Torches 2015-01-11 12:03:19 +00:00
Drullkus 473d25b475 #Blame Derpkus 2015-01-10 17:18:23 -08:00
tterrag1098 a94d2ce0e5 Add Drullkus changes 2015-01-10 17:28:25 -05:00
Arona Jones 36068fac77 Desc improvements for Tyrian 2015-01-10 18:24:39 +00:00
Arona Jones 58203550d0 Fix the errant space in Voidstone pillar names 2015-01-10 18:19:09 +00:00
Arona Jones d6732cf067 Fix two of the limestone blocks having the same description 2015-01-10 18:02:55 +00:00
Arona Jones aafcf60329 Add "planks" to the wood plank names 2015-01-10 17:51:00 +00:00
Arona Jones ea83933bc5 Bookshelf desc improvements 2015-01-10 17:46:42 +00:00
Arona Jones bed90adc77 Consistency edit 2015-01-10 17:36:10 +00:00
Arona Jones e005dfccc0 Some factory block description improvements 2015-01-10 17:35:49 +00:00
Arona Jones e9e4f2f542 Some Grim/Holystone language fixes 2015-01-10 17:34:13 +00:00
Arona Jones 44e772a059 Fix some fantasy block descriptions 2015-01-10 17:32:23 +00:00
Arona Jones 18969cb55d Replace all instances of 'weared' with 'worn' 2015-01-10 17:31:15 +00:00
Drullkus 22e9fe6af9 HEx Anim 2015-01-09 23:43:02 -08:00
tterrag1098 37a70f5674 Improve diamond chisel texture 2015-01-09 09:18:11 -05:00
tterrag1098 615b1ed395 Further simplify IChiselItem and improve chisel tooltips 2015-01-09 02:33:03 -05:00
tterrag1098 58a17dbe5a Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-09 01:50:41 -05:00
tterrag1098 fc36d03f5b Chisel item refactor.
Add chisel slot to autochisel. 
Refactor slot tooltip and valid items.
2015-01-09 01:50:32 -05:00
CptSpaceToaster 405e1c1d82 brightned hex-plating 2015-01-09 00:44:33 -05:00
Drullkus 2435947365 Pushing garbage texture for break particles, at Terag's request 2015-01-08 20:08:56 -08:00
tterrag1098 f2cdd40c78 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-08 19:44:09 -05:00
tterrag1098 45673eb832 Fix light gray hex block localization 2015-01-08 19:44:00 -05:00
Cricket 42745c0575 sarcasm and added something for a friend 2015-01-08 19:32:20 -05:00
Drullkus e3e21258c4 Update Autochisel tex 2015-01-08 16:26:55 -08:00
tterrag1098 25677d63ec Remove obsolete hex block textures 2015-01-08 19:05:37 -05:00
tterrag1098 d394a9a6e7 Add missing files 2015-01-08 18:36:23 -05:00
tterrag1098 89ed8e94ac Finish Hex Blocks (Fixes #98). Change block class names (warlordjones).
Fix items not loading
2015-01-08 18:34:47 -05:00
tterrag1098 85e58f4f57 Begin major feature structor overhaul. Just recipes left to do. 2015-01-08 05:46:10 -05:00
tterrag1098 a4e72bfa12 Add basic auto chisel model. Still needs texture and animated stuff. 2015-01-08 01:59:50 -05:00
tterrag1098 51a5c4817f Fix AutoChisel shift clicking and add tooltips 2015-01-07 23:36:27 -05:00
tterrag1098 7d801f69b5 Fix auto chisel functionality. Massively clean up and comment TE code. 2015-01-07 22:45:20 -05:00
Cricket 7a869bd522 Removed un-needed blocks 2015-01-07 19:00:12 -05:00
Adaptivity c6e49dcece Update ru_RU.lang 2015-01-07 15:07:55 +03:00
Cricket 77f3e7b4dd renamed 2015-01-06 21:11:57 -05:00
Cricket 335dd553de Fixed durability, and removed my stuff 2015-01-06 20:34:41 -05:00
Drullkus dc4e3601f0 No, BRAAAINZ.
Keep it >:(
2015-01-06 10:36:04 -08:00
Arona Jones 0727233853 Even more lang changes 2015-01-06 18:11:13 +00:00
Arona Jones a09e53ffe7 Another mispelling 2015-01-06 18:08:33 +00:00
Arona Jones 35057d1de0 Someone can't spell 2015-01-06 18:06:45 +00:00
Adaptivity e32cc4392e Update ru_RU.lang 2015-01-06 20:18:27 +03:00
Drullkus a3a58fd3f0 Adding three fixed CTM files.
They're close enough I guess. I'll tweak them later.
2015-01-05 21:00:37 -08:00
Cricket c25209da79 Fixed it and my horrible derp 👯 2015-01-05 20:57:32 -05:00
Cricket c587f259f1 Merge remote-tracking branch 'origin/master' 2015-01-05 20:25:30 -05:00