upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-11 15:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
821 Commits 5 Branches 98 Tags
89019aa6c202525af5ecba805ec0e73ec30a91cc
Commit Graph
76 Commits
Author SHA1 Message Date
Drullkus cd502623bf Quick fix to Nation 2015-03-07 08:46:29 -08:00
Drullkus 04c7575d88 Add Imperial+Rebel Blocks... :P 2015-03-07 08:03:26 -08:00
Cricket 50ba17f264 They just need descriptions 2015-03-04 16:40:02 -05:00
Drullkus 036c10c9c8 Dehackify things 2015-02-22 18:34:42 -08:00
Drullkus 60981e3ee8 Add Hex Armor Plating 2015-02-22 17:25:20 -08:00
Drullkus c87b48f3a1 Massive Fan finished and finished unification of all technical blocks 2015-02-22 10:21:45 -08:00
Drullkus 52ff5db188 Added Massive Fan; hacky implementation of Techical2 & Tech3 into Tech chisel group 2015-02-22 08:25:53 -08:00
tterrag1098 95996bd203 Add in 1.8 recipes for the 1.8 blocks 2015-02-21 18:36:26 -05:00
tterrag1098 6a3f2dbe5e Undo formatting changes 2015-02-19 19:15:11 -05:00
tterrag1098 4a8963a80b 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 530239fd72 Dev stuff is complete 2015-02-19 17:13:16 -05:00
tterrag1098 510a6fe0a7 Fix present localizations 2015-02-14 21:22:11 -05:00
Cricket e1d2afccd5 I have 2 done, I am not that creative 2015-02-12 21:33:58 -05:00
tterrag1098 385c692e1b Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-08 16:18:11 -05:00
tterrag1098 64128a241f Fix antiblocks not being chiselable even with config set to true 
Closes #213
 2015-02-08 16:18:01 -05:00
Drullkus 5c99de382e Fix the patterning on variation. It will now properly please your eyes! 2015-02-07 14:36:53 -08:00
Drullkus 213f588d70 ffs @TheCricket 2015-02-06 22:27:15 -08:00
Drullkus 5ecb45f357 Merge remote-tracking branch 'origin/dev' into dev 2015-02-06 22:25:29 -08:00
Drullkus 97ee6bfd74 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
tterrag1098 ac41278bfe Add compat for Railcraft 9.5.X. Fixes #203 2015-02-06 23:11:51 -05:00
Cricket e11287859d Fixes the drullkus derp 2015-02-06 20:50:26 -05:00
Drullkus a504475ed1 Commit new Masonry Textures, will implement them later 2015-02-04 22:02:59 -08:00
Drullkus d49c48f7eb Merge remote-tracking branch 'origin/dev' into dev 2015-02-04 21:02:49 -08:00
Drullkus 89cb42ca39 Commit new malfunctioning fan tex 2015-02-04 21:02:18 -08:00
Cricket 21dffb0b3f Added config option to chisel across colors 2015-02-04 20:20:01 -05:00
tterrag1098 b35a08bd06 Clean up @Drullkus' mess 2015-01-31 01:23:27 -05:00
Drullkus 4b6c85f565 Commit more textures for metals. Untested;stuffs may get broken 2015-01-30 22:06:41 -08:00
tterrag1098 662a9e7326 Fix some issues with ice/icestairs/icepillars/packedice (#189) 2015-01-29 16:58:45 -05:00
tterrag1098 70bc5071a8 Fix auto chisel unloc name 2015-01-27 19:59:41 -05:00
tterrag1098 d27492a555 Implement metal blocks and clean up some unloc names 2015-01-27 01:45:37 -05:00
Drullkus 418996a716 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-01-26 21:01:19 -08:00
Drullkus c6a96fd21c Stuff 2015-01-26 20:12:10 -08:00
tterrag1098 e1b28f7336 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into 
dev

Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
 2015-01-26 22:42:59 -05:00
tterrag1098 8faa70ba46 Rewrite presents. Still a bit WIP, needs sounds and lid animation 2015-01-26 22:41:48 -05:00
Cricket 049b0fb3bb Recipe fix for #180 2015-01-26 16:58:51 -05:00
tterrag1098 415cf2213a Fix copper feature 2015-01-25 20:11:43 -05:00
warlordjones 70ec42f12c Allow chiseling between oredictionaried copper blocks. 
In prep for adding blocktypes for copper.
 2015-01-25 20:40:46 +00:00
warlordjones 3bd4a62e72 Implement new Yellow bricktype 2015-01-25 20:40:46 +00:00
tterrag1098 a4f779ef0f Add config to prevent chiseling between vanilla leaf types. 
Closes #171
 2015-01-24 23:32:51 -05:00
tterrag1098 ef86c3f4ae Fix typo in granite descriptions 2015-01-24 22:04:47 -05:00
tterrag1098 fa2dee3d77 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
tterrag1098 a38b7c4f23 Fix antiblock recipes, and all dye-using recipes now support oredict 2015-01-20 20:39:14 -05:00
tterrag1098 8a539dfeaa Merge branch 'master' into dev 
Conflicts:
	changelog
 2015-01-20 20:05:29 -05:00
tterrag1098 3f9f2955da Update preparing for 2.3.2, fix antiblocks being chiselable 2015-01-20 20:04:46 -05:00
Cricket 61fc228dd3 oopsy 2015-01-20 19:20:07 -05:00
Cricket 378453692b Recipes added 2015-01-20 18:43:51 -05:00
tterrag1098 09d72a44b8 Fix jackolanterns not emitting light 2015-01-19 21:18:48 -05:00
tterrag1098 d4bd181ef1 Add some lifecycle logging to Features 2015-01-19 18:59:25 -05:00
warlordjones 65bbfafce9 Oops 2015-01-17 14:53:24 +00:00
warlordjones c5578680fe Add requested O2 warning sign 2015-01-17 14:51:29 +00:00