Commit Graph
234 Commits
Author SHA1 Message Date
Drullkus d4366617d1 Merge remote-tracking branch 'origin/dev' into dev 2015-02-06 22:25:29 -08:00
Drullkus e62fe8ef3d Commit working Malfunction fan stuff, and do other stuffs
Also patched the build.gradle to play nicely with IntelliJ 14.
2015-02-06 22:25:09 -08:00
Cricket f9814209ca Fixes the drullkus derp 2015-02-06 20:50:26 -05:00
Drullkus 0431b9e119 Commit new Masonry Textures, will implement them later 2015-02-04 22:02:59 -08:00
Drullkus ed3e85f1a5 Commit new malfunctioning fan tex 2015-02-04 21:02:18 -08:00
Drullkus 0afed73114 Commit more textures for metals. Untested;stuffs may get broken 2015-01-30 22:06:41 -08:00
tterrag1098 f61de467f7 Fix some issues with ice/icestairs/icepillars/packedice (#189) 2015-01-29 16:58:45 -05:00
tterrag1098 9a05bc03a9 Implement metal blocks and clean up some unloc names 2015-01-27 01:45:37 -05:00
Drullkus 27b14d2889 Add textures for metals :p 2015-01-26 21:43:19 -08:00
Drullkus d67fa838de Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-01-26 21:01:19 -08:00
Drullkus 2ffdafe5a6 Stuff 2015-01-26 20:12:10 -08:00
warlordjones 7b33ffc721 Implement new Yellow bricktype 2015-01-25 20:40:46 +00:00
tterrag1098 70f5045418 Fix chiseling stained glass always showing white variations.
Closes #174
2015-01-24 23:22:55 -05:00
tterrag1098 df6c167db0 Fix #176 bad aged brick texture
@Drullkus please feel free to fix my bad art :D
2015-01-24 22:35:03 -05:00
tterrag1098 d4523481d4 Fix all worldgen issues. Use 1.8 textures. Implement 1.8 block pillars.
Closes #168
Closes #159
Closes #130
2015-01-24 22:03:30 -05:00
Adaptivity 358d8cd51f Update ru_RU.lang 2015-01-20 18:03:16 +03:00
tterrag1098 c35bef2bc4 Allow only the diamond chisel to have modes. Fix breaking sounds up more 2015-01-19 11:23:11 -05:00
tterrag1098 665ed94a99 Finish chisel modes 2015-01-18 15:58:13 -05:00
tterrag1098 b8eaaca678 Merge pull request #154 from Adaptivity/patch-1
Update ru_RU.lang
2015-01-17 19:58:46 -05:00
warlordjones 52fcf4f9a7 Add requested O2 warning sign 2015-01-17 14:51:29 +00:00
warlordjones 4b8c579622 Update Ice pillar descs 2015-01-17 14:20:42 +00:00
warlordjones 1af2224ad4 Full Block Version of Paperwall, as requested 2015-01-17 14:07:18 +00:00
Anton 16d4848547 Update ru_RU.lang 2015-01-17 10:39:05 +03:00
Drullkus f7ff55c62a Add another two thaumium block variants 2015-01-14 21:22:59 -08:00
Drullkus b268ebeca0 Add two new Thaumium blocks 2015-01-14 20:59:20 -08:00
Tonius 7413b72cc5 Merge remote-tracking branch 'github/dev' into nei 2015-01-14 11:36:22 +01:00
Tonius 879f370b76 Fixed up NEI handler 2015-01-14 11:32:59 +01:00
tterrag1098 0d0f73db2a Make all background slot images overlays, only render if slot is empty 2015-01-13 21:37:04 -05:00
Drullkus 69effc0919 Updated GUI files 2015-01-12 17:26:03 -08:00
tterrag1098 d518d2e0a4 Implement new chisel GUI 2015-01-12 19:24:29 -05:00
tterrag1098 c76bea1801 Fix chisel in autochisel GUI texture not lining up with the actual item 2015-01-12 18:01:56 -05:00
warlordjones 9c540b0b9c 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 423b017336 Fix blood rune descs 2015-01-12 20:50:40 +00:00
warlordjones 3d79cef938 Some tallow varieties 2015-01-12 19:07:56 +00:00
warlordjones 41cf154820 Turn down the brightness on Arcane Tiles a bit, they stood out too much IMO 2015-01-12 19:03:02 +00:00
warlordjones 2ca08e198a Nicer Voidstone Quarters Texture 2015-01-12 19:01:17 +00:00
warlordjones 4cf99bdc8d Convert Voidstone Pillar to the CTM Pillar type 2015-01-12 19:01:06 +00:00
tterrag1098 395482e8ab Fix out of order road line descriptions 2015-01-12 03:46:51 -05:00
tterrag1098 2020424e13 Fix buildscript for dev builds and unify version variable 2015-01-11 23:30:10 -05:00
CptSpaceToaster a77e5615c0 an orange texture was blue... oops 2015-01-11 22:59:18 -05:00
CptSpaceToaster dc4495e0b7 Finalizing AntiBlock prototype 2015-01-11 22:37:51 -05:00
CptSpaceToaster bbc33601f8 Merge branch 'dev' into antiblocks 2015-01-11 22:30:31 -05:00
CptSpaceToaster 6cb72d2f03 Included Resources for AntiBlock Prototypes 2015-01-11 20:55:21 -05:00
CptSpaceToaster 7e1e437bbf Prototyped Antiblocks 2015-01-11 20:53:24 -05:00
warlordjones fb225ee244 Switch Road Lines to meta 2015-01-11 21:54:36 +00:00
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