Commit Graph
795 Commits
Author SHA1 Message Date
Drullkus 6c19e9ec9f Curating the Chisel P1: Spicing up both Hexplating blocks 2015-05-14 10:44:30 -07:00
Drullkus 4c5716e4b0 Remove purple texture animation thing. :( 2015-05-13 21:42:29 -07:00
Drullkus 40a2daca84 Fix stupid mistake on commenting out AE Snakestone 2015-05-13 18:26:08 -07:00
Drullkus da1d45b7e1 Fix anim reference 2015-05-13 18:24:33 -07:00
Drullkus 3e33044582 Add new texture, update mods 2015-05-13 15:31:39 -07:00
Drullkus c921d4aed2 Killing the fake AE Snakestone for favor of new one. 2015-05-13 13:02:58 -07:00
tterrag1098 f8a1f4d937 Remove generics from ISubmapManager to prevent serverside errors 2015-05-13 13:19:24 -04:00
tterrag1098 fb70c66184 Fix same error in CTMV... 2015-05-12 13:30:23 -04:00
tterrag1098 319e80a065 Fix CTMH crash 2015-05-12 13:08:27 -04:00
tterrag1098 804edfbf95 Make CTM extendable and make ctm field of RenderBlocksCTM nonstatic 2015-05-09 21:07:33 -04:00
tterrag1098 9f0c9d0b6c Add block param to createRenderContext. Set render bounds from blocks.
Closes #311
2015-05-09 20:07:28 -04:00
tterrag1098 9aa5c25175 Move RenderBlocksColumn to API (for now), bump API version. Closes #314 2015-05-01 19:44:51 -04:00
tterrag1098 bd32f65ace Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-05-01 17:37:31 -04:00
tterrag1098 b3b617f04c Chiseled netherrack will now sustain fire on top of it 2015-05-01 17:37:10 -04:00
Drullkus e58a83dbed These were sitting in my local content, I should commit them 2015-04-28 19:30:40 -07:00
tterrag1098 367a604496 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-26 22:04:14 -04:00
tterrag1098 48aa74714e Hopefully last try at #309... 2015-04-26 22:04:05 -04:00
Cricket 756f4dee36 Merge pull request #310 from autopsychorhythmia/patch-1
Update zh_CN.lang
2015-04-26 19:03:10 -07:00
Erlkönig fe2f2b976a Update zh_CN.lang 2015-04-27 10:00:40 +08:00
tterrag1098 ab72d05134 More SideOnly safety, should fix #309 again 2015-04-26 21:46:18 -04:00
tterrag1098 9e0b56afe1 Fix #308 #309 Crashes on startup 2015-04-26 20:33:39 -04:00
tterrag1098 aac68bd58e Merge branch 'remove_carvablevariation' into dev
Conflicts:
	src/main/java/com/cricketcraft/chisel/api/IMC.java
2015-04-26 02:43:43 -04:00
tterrag1098 f62f9c6a47 Move RenderBlocksCTM to API, add ClientUtils 2015-04-26 02:35:16 -04:00
tterrag1098 2f6b455514 Get rid of the ugly RenderBlocksCTMFullbright, some other refactors 2015-04-26 02:30:39 -04:00
tterrag1098 3ae753ebc3 Fix some typos and unused code 2015-04-24 17:07:00 -04:00
tterrag1098 66d79e9d99 Move CarvableHelper to API 2015-04-24 17:05:12 -04: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 42cc14f7b2 Fix IMC referencing Chisel.class for the mod ID 2015-04-24 13:23:58 -04:00
tterrag1098 9b4fc25600 The nuke has landed! (Remove CarvableVariation) 2015-04-24 03:51:38 -04:00
tterrag1098 65693b868c Completely modularize submap and RenderBlocks managing
- Fix RenderBlocksCTM ignoring the renderMin/Max values
- Add custom handler for carpet to avoid hardcoding
- TODO blocks that use existing blocks as icons, e.g. ice stairs
2015-04-24 03:38:37 -04:00
tterrag1098 bc607a3104 Begin CarvableVariation nuke, have hit some roadblocks in CTM rendering 2015-04-23 20:33:29 -04:00
tterrag1098 d50f2c9da5 Some class renaming, move TextureSubmap to API and improve its methods 2015-04-23 17:31:25 -04:00
tterrag1098 c2fa40d57e Move ISubmapManager to its own API file 2015-04-23 16:45:28 -04:00
tterrag1098 70af7b4d67 #301 crash invalid with marble pillar metadatas 2015-04-23 16:40:44 -04:00
tterrag1098 093fb5263c Merge branch 'ctm_refactor2' into dev 2015-04-23 00:35:02 -04:00
tterrag1098 2138aed80c CTM refactor is complete, officially dubbing next version 2.4 2015-04-23 00:34:37 -04:00
tterrag1098 6105a6104c Fix accidental reversion of CarvableHelper code during merge 2015-04-23 00:27:42 -04:00
tterrag1098 ee4eb3c357 Javadoc typo 2015-04-22 22:04:27 -04:00
tterrag1098 00647ece1a Add missing Dir file 2015-04-22 21:57:39 -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 7f77a7de98 Merge branch 'master' into ctm_refactor2 2015-04-22 21:47:55 -04:00
tterrag1098 07f53ae6fb Clean up CTM documentation and move to API 2015-04-22 21:47:44 -04:00
tterrag1098 4f70831d35 Implement Fake AE Controller with the new ISubmapManager system 2015-04-22 21:04:40 -04:00
tterrag1098 0139a894f0 Implement ISubmapManager for custom IIcon handling 2015-04-22 18:00:56 -04:00
tterrag1098 85711e377e Massively clean up CTM code, much more readable now 2015-04-22 17:52:03 -04:00
warlordjones c2ad2bc5fa Fix #289 2015-04-12 17:41:35 +01: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 0c66282e57 Rename some things... 2015-04-08 13:38:41 -07:00