Commit Graph
273 Commits
Author SHA1 Message Date
Anton 90279aea27 Update ru_RU.lang 2015-01-17 10:39:05 +03:00
Drullkus ed7cd3d39c Add another two thaumium block variants 2015-01-14 21:22:59 -08:00
Drullkus be58acd783 Add two new Thaumium blocks 2015-01-14 20:59:20 -08:00
Tonius 70b29cd506 Merge remote-tracking branch 'github/dev' into nei 2015-01-14 11:36:22 +01:00
Tonius bd9ee17813 Fixed up NEI handler 2015-01-14 11:32:59 +01:00
tterrag1098 80f6bbf156 Make all background slot images overlays, only render if slot is empty 2015-01-13 21:37:04 -05:00
Drullkus 5545117666 Updated GUI files 2015-01-12 17:26:03 -08:00
tterrag1098 53c13c48c4 Implement new chisel GUI 2015-01-12 19:24:29 -05:00
tterrag1098 0420b1655c Fix chisel in autochisel GUI texture not lining up with the actual item 2015-01-12 18:01:56 -05:00
warlordjones 347eaebb8d Convert Ice pillars to CTM method
Also make Packed Ice use textures from the ice folder, no sense in duping the folder and adding packed to the front

TODO: Convert the old pillars to new on world load?
2015-01-12 22:25:54 +00:00
warlordjones 450ded186e Fix blood rune descs 2015-01-12 20:50:40 +00:00
warlordjones 9534c4e696 Some tallow varieties 2015-01-12 19:07:56 +00:00
warlordjones 65763f53c8 Turn down the brightness on Arcane Tiles a bit, they stood out too much IMO 2015-01-12 19:03:02 +00:00
warlordjones e16fb3ecf6 Nicer Voidstone Quarters Texture 2015-01-12 19:01:17 +00:00
warlordjones 12f53e97aa Convert Voidstone Pillar to the CTM Pillar type 2015-01-12 19:01:06 +00:00
tterrag1098 8f28a2e6ee Fix out of order road line descriptions 2015-01-12 03:46:51 -05:00
tterrag1098 e5b72a2805 Fix buildscript for dev builds and unify version variable 2015-01-11 23:30:10 -05:00
CptSpaceToaster 64fb6be33a an orange texture was blue... oops 2015-01-11 22:59:18 -05:00
CptSpaceToaster 2432174093 Finalizing AntiBlock prototype 2015-01-11 22:37:51 -05:00
CptSpaceToaster 36fc0ed5f2 Merge branch 'dev' into antiblocks 2015-01-11 22:30:31 -05:00
CptSpaceToaster f659a8ca23 Included Resources for AntiBlock Prototypes 2015-01-11 20:55:21 -05:00
CptSpaceToaster 9005839065 Prototyped Antiblocks 2015-01-11 20:53:24 -05:00
warlordjones d0e133ea63 Switch Road Lines to meta 2015-01-11 21:54:36 +00:00
Drullkus 811251ae34 Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:21:40 -08:00
Drullkus 9a35b1af4d ??? 2015-01-11 13:21:05 -08:00
warlordjones 8cce402420 Implement more road lines - Double White, Yellow and Double Yellow 2015-01-11 21:19:33 +00:00
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