Commit Graph
923 Commits
Author SHA1 Message Date
Cricket 014a8d4455 Merge pull request #310 from autopsychorhythmia/patch-1
Update zh_CN.lang
2015-04-26 19:03:10 -07:00
Erlkönig 7e618de338 Update zh_CN.lang 2015-04-27 10:00:40 +08:00
tterrag1098 f0cb6555a8 More SideOnly safety, should fix #309 again 2015-04-26 21:46:18 -04:00
tterrag1098 fbab0eb9d8 Fix #308 #309 Crashes on startup 2015-04-26 20:33:39 -04:00
tterrag1098 ad13b2a39e 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 b3555e52f9 Move RenderBlocksCTM to API, add ClientUtils 2015-04-26 02:35:16 -04:00
tterrag1098 87072102f8 Get rid of the ugly RenderBlocksCTMFullbright, some other refactors 2015-04-26 02:30:39 -04:00
tterrag1098 5ad6f5c98e Fix some typos and unused code 2015-04-24 17:07:00 -04:00
tterrag1098 47abdbbc10 Move CarvableHelper to API 2015-04-24 17:05:12 -04:00
tterrag1098 3013e263a2 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 be4158e9a6 Fix IMC referencing Chisel.class for the mod ID 2015-04-24 13:23:58 -04:00
tterrag1098 3999d31342 The nuke has landed! (Remove CarvableVariation) 2015-04-24 03:51:38 -04:00
tterrag1098 41877f3543 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 80149390b6 Begin CarvableVariation nuke, have hit some roadblocks in CTM rendering 2015-04-23 20:33:29 -04:00
tterrag1098 56d90a8321 Some class renaming, move TextureSubmap to API and improve its methods 2015-04-23 17:31:25 -04:00
tterrag1098 59d5a9d259 Move ISubmapManager to its own API file 2015-04-23 16:45:28 -04:00
tterrag1098 0b0ef5846f #301 crash invalid with marble pillar metadatas 2015-04-23 16:40:44 -04:00
tterrag1098 59dcf10846 Merge branch 'ctm_refactor2' into dev 2015-04-23 00:35:02 -04:00
tterrag1098 dffb73c5b4 CTM refactor is complete, officially dubbing next version 2.4 2015-04-23 00:34:37 -04:00
tterrag1098 c0f342f094 Fix accidental reversion of CarvableHelper code during merge 2015-04-23 00:27:42 -04:00
tterrag1098 31ea512b48 Javadoc typo 2015-04-22 22:04:27 -04:00
tterrag1098 87ce7b34c3 Add missing Dir file 2015-04-22 21:57:39 -04:00
tterrag1098 9b0b5fc592 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 bf79e8ff97 Merge branch 'master' into ctm_refactor2 2015-04-22 21:47:55 -04:00
tterrag1098 be707a89fe Clean up CTM documentation and move to API 2015-04-22 21:47:44 -04:00
tterrag1098 3b62791a0f Implement Fake AE Controller with the new ISubmapManager system 2015-04-22 21:04:40 -04:00
tterrag1098 c647044006 Implement ISubmapManager for custom IIcon handling 2015-04-22 18:00:56 -04:00
tterrag1098 2c8d88a639 Massively clean up CTM code, much more readable now 2015-04-22 17:52:03 -04:00
warlordjones 12efb9ff76 Fix #289 2015-04-12 17:41:35 +01:00
warlordjones bb7d6b9693 Fix #288 2015-04-10 01:01:36 +01:00
CptSpaceToaster 18e96bbf8e Merge pull request #275 from nark31/KR_Translate
Update ko_KR.lang
2015-04-09 08:22:07 -04:00
Nark 7b195124da Update ko_KR.lang
add Fake Controller
2015-04-09 18:57:39 +09:00
Drullkus a58e8bee86 Rename some things... 2015-04-08 13:38:41 -07:00
Drullkus eb3f8f6d1d Change the cracked stone anim 2015-04-08 13:31:44 -07:00
Drullkus b85bebd972 Finalize hacky AE Falsetto Controller 2015-04-08 10:45:00 -07:00
Drullkus 90a700b73b Thanks, outdated code. @tterrag 2015-04-08 10:36:15 -07:00
Drullkus c402af9430 AE Falsetto Controller hack 2015-04-08 10:26:50 -07:00
Nark dff25bb536 Update ko_KR.lang
Update mistranslate
2015-04-08 22:25:57 +09:00
Nark 39c3861f50 Update ko_KR.lang 2015-04-08 22:23:02 +09:00
Drullkus 22e86710e3 Circuit variations for all of your Futurama needs! 2015-04-07 22:35:59 -07:00
Drullkus cf6313960d Fix strobe animation 2015-04-07 21:31:46 -07:00
Drullkus c1ccba9f70 Add generic animations folder... Just organization. 2015-04-07 21:22:51 -07:00
CptSpaceToaster 8998a151eb Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-04-06 21:51:18 -04:00
CptSpaceToaster 64f507d136 final edits to changelog 2015-04-06 21:50:32 -04:00
tterrag1098 4bcfeb1889 Fix issues with present clientside desync 2015-04-06 21:44:37 -04:00
tterrag1098 7c9f8eca2d Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-06 21:39:35 -04:00
tterrag1098 a71ec55104 Fix issues with presents and chunk boundaries / orphan chunks 2015-04-06 21:39:20 -04:00
CptSpaceToaster cab23954ef Updated changelog to reflect our pirate roots 2015-04-06 19:56:09 -04:00
Drullkus fa3dad02a6 Add last ARcane stone variant 2015-04-06 16:52:21 -07:00
CptSpaceToaster fc87567681 updated changelog and version number for release 2015-04-06 19:48:55 -04:00