Commit Graph
458 Commits
Author SHA1 Message Date
warlordjones ffe28a56ac Add the thaumcraft API (Slimmed down) 2015-02-28 14:32:52 +00:00
warlordjones 6ac2dbbc57 Project Red Marble Bricks compat (Fixes #214) 2015-02-27 18:57:31 +00:00
warlordjones d093235f6a Custom particles respect the particles setting in the vanilla options menu (Fixes #240) 2015-02-27 15:22:14 +00:00
tterrag1098 b23ce4ded0 Fix imports 2015-02-25 04:24:11 -05:00
Cricket 21d4b523d5 Merge pull request #245 from yesimwearingpants/dev
Added Search to CreativeTabs
2015-02-24 20:58:13 -05:00
yesimwearingpants b63bb69fff Fixed Derp 2015-02-24 20:20:31 -05:00
yesimwearingpants 760deb9abf Added Search To CreativeTabs 2015-02-24 20:03:04 -05:00
tterrag1098 c365568d54 Fix stair placement and tooltip bugs. Closes #235 2015-02-23 13:05:24 -05:00
tterrag1098 99fb926ff1 Improve dev special rendering system 2015-02-23 02:29:10 -05:00
tterrag1098 a1cb5cf61c Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-23 00:27:23 -05:00
tterrag1098 7f3fabcb96 Remove extra PlayerSpecials registration that crashes servers 2015-02-23 00:26:42 -05:00
Drullkus 3275ffe8ca Dehackify things 2015-02-22 18:34:42 -08:00
Drullkus 53ad987158 Add Hex Armor Plating 2015-02-22 17:25:20 -08:00
Drullkus dad374f985 Massive Fan finished and finished unification of all technical blocks 2015-02-22 10:21:45 -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 aa5d07ba47 Fix #237
Fortunatly the check isn't hardcoded :D
2015-02-22 02:42:24 +00:00
warlordjones 0108468fc2 Fix #231 (The minorest of bugs :P) 2015-02-22 02:29:43 +00:00
warlordjones 546485cf3b Prevent RC Invisiblock related crashes (Closes #238) 2015-02-22 01:50:45 +00:00
warlordjones 5baf4951d9 Fix #222 2015-02-22 01:37:51 +00:00
tterrag1098 113fde136f Add in 1.8 recipes for the 1.8 blocks 2015-02-21 18:36:26 -05:00
tterrag1098 cd22a6fb4e Make sure to call canChisel from autochisel 2015-02-21 02:54:59 -05:00
tterrag1098 282d4766d8 Undo formatting changes 2015-02-19 19:15:11 -05: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 e3e7529018 Dev stuff is complete 2015-02-19 17:13:16 -05:00
tterrag1098 25a54b71e1 Fix left clicking a metal block incorrectly changing the type 2015-02-16 12:40:08 -05:00
tterrag1098 55807a5f0b Fix present shift clicking 2015-02-14 22:15:45 -05:00
tterrag1098 71a9003b79 Fix present localizations 2015-02-14 21:22:11 -05:00
Cricket 005a8c5b9e I have 2 done, I am not that creative 2015-02-12 21:33:58 -05:00
tterrag1098 a7609cff3c Whoops left a sysout 2015-02-11 22:53:05 -05:00
tterrag1098 c3ee02b3f2 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-11 22:04:11 -05:00
tterrag1098 3ed961c526 Fix reamining present issues:
- Fix dupes
- Fix bounding boxes
- Fix inventory order being swapped in the GUI
- Fix in-world chiseling not working
- Fix losing items when metadata changes
2015-02-11 22:03:53 -05:00
Cricket 41fd650c9a Merge pull request #215 from AtomicBlom/brickTexturing
change V4 and V9 textures to tiling instead of staircasing
2015-02-11 05:44:51 -08:00
CptSpaceToaster bc8e2a5c67 Added 16 configuration options to control the color overlay of HexBlocks 2015-02-08 23:37:56 -05:00
Steven Blom bad1ef296f Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing 2015-02-09 10:10:04 +10:30
tterrag1098 56e2a8fea2 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-08 16:18:11 -05:00
tterrag1098 31ae34e899 Fix antiblocks not being chiselable even with config set to true
Closes #213
2015-02-08 16:18:01 -05:00
Drullkus 4afdb1a5b1 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-02-07 14:43:08 -08:00
Drullkus fa34b7fd22 Fix the patterning on variation. It will now properly please your eyes! 2015-02-07 14:36:53 -08:00
warlordjones 5adad569df Fix packed ice pillars being transparent (#189) 2015-02-07 16:19:43 +00:00
warlordjones 4f514bea5e Add fallback icons for all tabs. Fixes #202 2015-02-07 16:13:19 +00:00
Drullkus 1e7d12f597 ffs @TheCricket 2015-02-06 22:27:15 -08:00
Drullkus d4366617d1 Merge remote-tracking branch 'origin/dev' into dev 2015-02-06 22:25:29 -08:00
Drullkus e62fe8ef3d 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 92d01d4e5b Add compat for Railcraft 9.5.X. Fixes #203 2015-02-06 23:11:51 -05:00
tterrag1098 968782ba0e Add IMC for adding/removing variations and registering oredict 2015-02-06 21:47:17 -05:00
Cricket c527d5d7c5 Fixes #187 Everything else is harvestable by fists 2015-02-06 21:20:23 -05:00
Cricket 54f65fab25 Fixes #200 2015-02-06 21:13:36 -05:00
Cricket 912fbb6946 Fixes #199 2015-02-06 21:03:17 -05:00
Cricket f9814209ca Fixes the drullkus derp 2015-02-06 20:50:26 -05:00
Drullkus 0431b9e119 Commit new Masonry Textures, will implement them later 2015-02-04 22:02:59 -08:00