Commit Graph
291 Commits
Author SHA1 Message Date
Drullkus e58a83dbed These were sitting in my local content, I should commit them 2015-04-28 19:30:40 -07:00
Erlkönig fe2f2b976a Update zh_CN.lang 2015-04-27 10:00:40 +08:00
tterrag1098 8abc50634b RenderBlocksCTM will now respect the render bounds (read below)
This behavior allows for certain renderers to no longer be needed
(carpet floor) and for some rendering to be possible (CTM slabs).

A single version of marble slab has been implemented with CTM as an
example, we will move over the rest of the textures once this is
finalized.
2015-04-24 16:43:30 -04:00
tterrag1098 093fb5263c Merge branch 'ctm_refactor2' into dev 2015-04-23 00:35:02 -04:00
tterrag1098 d0d01fbb68 Merge branch 'dev' into ctm_refactor2
Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
	src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
	src/main/java/com/cricketcraft/chisel/config/Configurations.java
2015-04-22 21:56:10 -04:00
tterrag1098 4f70831d35 Implement Fake AE Controller with the new ISubmapManager system 2015-04-22 21:04:40 -04:00
warlordjones 77e95fb934 Fix #288 2015-04-10 01:01:36 +01:00
CptSpaceToaster 430b852822 Merge pull request #275 from nark31/KR_Translate
Update ko_KR.lang
2015-04-09 08:22:07 -04:00
Nark 1fd23908e9 Update ko_KR.lang
add Fake Controller
2015-04-09 18:57:39 +09:00
Drullkus fd90784d03 Change the cracked stone anim 2015-04-08 13:31:44 -07:00
Drullkus c36cf92671 Finalize hacky AE Falsetto Controller 2015-04-08 10:45:00 -07:00
Drullkus 4f318afb57 AE Falsetto Controller hack 2015-04-08 10:26:50 -07:00
Nark 414378000b Update ko_KR.lang
Update mistranslate
2015-04-08 22:25:57 +09:00
Nark 6e02463c2e Update ko_KR.lang 2015-04-08 22:23:02 +09:00
Drullkus 6c51b8e437 Circuit variations for all of your Futurama needs! 2015-04-07 22:35:59 -07:00
Drullkus ec1dc93a7d Fix strobe animation 2015-04-07 21:31:46 -07:00
Drullkus b9d11126b9 Add generic animations folder... Just organization. 2015-04-07 21:22:51 -07:00
Drullkus b6c04a92e8 Add last ARcane stone variant 2015-04-06 16:52:21 -07:00
Drullkus f0e25b2804 New arcane stone types 2015-04-06 14:29:40 -07:00
warlordjones 7dc56ea093 Implement some more of the unused textures as factory variants
Only two textures I can't find a home for
2015-04-06 19:24:21 +01:00
warlordjones 4b2bd3af03 Implement the 'chrono' texture as a glass variant 2015-04-06 17:52:15 +01:00
warlordjones 872127952f Delete some useless textures from the unused folder 2015-04-06 17:31:50 +01:00
warlordjones 4deff8a7be 16-colour runic voidstone - closes #218 2015-04-05 16:34:08 +01:00
Nark df49bae3b3 Update ko_KR.lang
Add Iron/Gold blocks and to Oredict
2015-04-01 00:52:56 +09:00
Nark 0cd1252801 Update ko_KR.lang 2015-03-25 14:48:55 +09:00
Drullkus 6f2618e716 Merge remote-tracking branch 'origin/dev' into dev 2015-03-11 13:44:17 -07:00
Drullkus f9fa6ec129 Add Iron/Gold blocks and to Oredict, Recolored Antiblocks a little 2015-03-11 13:44:02 -07:00
Cricket 9b0e54038f Added a banner 2015-03-09 20:55:51 -04:00
Drullkus 2a3b812b8a Implement new 1.8 textures 2015-03-08 18:12:17 -07:00
Drullkus 91bd6dca26 Commit new textures for the 1.8 stones 2015-03-08 17:56:44 -07:00
Drullkus 45bd487a07 This didn't get committed? 2015-03-08 14:07:02 -07:00
Drullkus 84a29c7a38 Merge remote-tracking branch 'origin/dev' into dev 2015-03-08 14:06:01 -07:00
Drullkus 2dcb2b51b4 Added Large Hex Plating 2015-03-08 14:05:34 -07:00
Cricket 3e2a5cb524 You make special snow golems now 2015-03-08 16:48:05 -04:00
Drullkus beb986e7f7 Fix up Masonry textures 2015-03-08 09:59:38 -07:00
Mango 0e64c1ab5f More Shinglesssss!!!
More more more!
2015-03-07 20:02:35 +01:00
Mango 4238109cbf 1 more Shingle Texture added
Added another Shingle Textures, Whoop Whoop!
2015-03-07 20:02:34 +01:00
Drullkus 1155bac58b Fix derp in lang file 2015-03-07 09:22:03 -08:00
Drullkus 1374ca5d1f Add Imperial+Rebel Blocks... :P 2015-03-07 08:03:26 -08:00
Mango 156827d5cc Description started #Shingles
Made a small description for the Shingle Textures, more are comming
soon!
2015-03-07 12:47:13 +01:00
Mango d7e3698f6a Shingle Textures
Here are the Shingle Textures.
2015-03-06 23:15:16 +01:00
Cricket 601573eb81 They just need descriptions 2015-03-04 16:40:02 -05:00
Cricket b7e32136e5 Fixed leaf naming 2015-02-27 17:18:25 -05:00
Drullkus 53ad987158 Add Hex Armor Plating 2015-02-22 17:25:20 -08:00
Drullkus 9fd27ce29c Added Massive Fan; hacky implementation of Techical2 & Tech3 into Tech chisel group 2015-02-22 08:25:53 -08:00
warlordjones 284f82f487 Fix #232 2015-02-22 01:46:08 +00:00
tterrag1098 bf4ce506e5 Merge remote-tracking branch 'origin/Cricket' into dev
Conflicts:
	src/main/java/com/cricketcraft/chisel/Chisel.java
	src/main/java/com/cricketcraft/chisel/Features.java
	src/main/java/com/cricketcraft/chisel/config/Configurations.java
	src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
2015-02-19 19:11:16 -05:00
Cricket 72a74f1ff6 Forgot the texture... 2015-02-19 17:14:38 -05:00
Cricket e3e7529018 Dev stuff is complete 2015-02-19 17:13:16 -05:00
Anton 86dbd54b16 Update ru_RU.lang 2015-02-15 09:49:40 +03:00