upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
950 Commits 5 Branches 98 Tags
f15b883dfd06c7ff8aba5e57b11fba5f868e1189
Commit Graph
950 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Drullkus f15b883dfd I reject your changes to the nation blocks and substitute my own! 2015-05-15 10:20:22 -07:00
Drullkus 7e2f6ebb4c Curating the Chisel P5: Added some unused textures; added variation order to some blocks. 
For reasons.
 2015-05-15 09:46:50 -07:00
Drullkus 303ea3ff8b Curating the Chisel P4.1: Removed overloading 2015-05-15 09:44:49 -07:00
Cricket 31f5451a60 Added EE3 EMC values 2015-05-14 20:50:46 -04:00
Drullkus 135fd68c4b Curating the Chisel P3: Added variation ordering 2015-05-14 14:10:02 -07:00
Drullkus d2f49b70e6 Curating the Chisel P2.3.1: Removed commented-out code. 2015-05-14 13:17:45 -07:00
Drullkus 3d08b320c1 Curating the Chisel P2.3: Merged sandstone_scribbles into sandstone 2015-05-14 13:15:22 -07:00
Drullkus 1f27230d59 Curating the Chisel P2.2: Picked and moved 3 sandstone variants into use. 2015-05-14 13:02:03 -07:00
Drullkus 0158956106 Curating the Chisel P2.1: Oops, forgot a part for the sandstone 2015-05-14 12:09:40 -07:00
Drullkus 670d29853b Curating the Chisel P2: Reorganizing the sandstone folder. May implement these someday ;) 2015-05-14 10:48:31 -07:00
Drullkus 8789421b5e Curating the Chisel P1: Spicing up both Hexplating blocks 2015-05-14 10:44:30 -07:00
Drullkus ef49cf2232 Remove purple texture animation thing. :( 2015-05-13 21:42:29 -07:00
Drullkus df0963e138 Fix stupid mistake on commenting out AE Snakestone 2015-05-13 18:26:08 -07:00
Drullkus db0991753f Fix anim reference 2015-05-13 18:24:33 -07:00
Drullkus 0ef42c2327 Add new texture, update mods 2015-05-13 15:31:39 -07:00
Drullkus f2e086712a Killing the fake AE Snakestone for favor of new one. 2015-05-13 13:02:58 -07:00
tterrag1098 31328b0ac1 Remove generics from ISubmapManager to prevent serverside errors 2015-05-13 13:19:24 -04:00
tterrag1098 62a38e9816 Fix same error in CTMV... 2015-05-12 13:30:23 -04:00
tterrag1098 f1a1b27971 Fix CTMH crash 2015-05-12 13:08:27 -04:00
tterrag1098 f6b67163b0 Make CTM extendable and make ctm field of RenderBlocksCTM nonstatic 2015-05-09 21:07:33 -04:00
tterrag1098 8a5645760b Add block param to createRenderContext. Set render bounds from blocks. 
Closes #311
 2015-05-09 20:07:28 -04:00
tterrag1098 b2a394741f Move RenderBlocksColumn to API (for now), bump API version. Closes #314 2015-05-01 19:44:51 -04:00
tterrag1098 17f2a16bd3 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-05-01 17:37:31 -04:00
tterrag1098 49e4329646 Chiseled netherrack will now sustain fire on top of it 2015-05-01 17:37:10 -04:00
Drullkus 7e66627cd4 These were sitting in my local content, I should commit them 2015-04-28 19:30:40 -07:00
tterrag1098 40b0ea7ac0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-26 22:04:14 -04:00
tterrag1098 37e77f00f8 Hopefully last try at #309... 2015-04-26 22:04:05 -04:00
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