Commit Graph
670 Commits
Author SHA1 Message Date
Drullkus 102f56a7da Quick fix to Nation 2015-03-07 08:46:29 -08:00
Drullkus 88aa1497d3 Er, idk if this is the actual lib folder...? :S 2015-03-07 08:27:16 -08:00
Drullkus ec7f90a938 Nobody's getting my Thaumcraft Deobf jar! >:P 2015-03-07 08:21:43 -08:00
Drullkus 1374ca5d1f Add Imperial+Rebel Blocks... :P 2015-03-07 08:03:26 -08:00
Mango 156827d5cc Description started #Shingles
Made a small description for the Shingle Textures, more are comming
soon!
2015-03-07 12:47:13 +01:00
Mango d7e3698f6a Shingle Textures
Here are the Shingle Textures.
2015-03-06 23:15:16 +01:00
Cricket 601573eb81 They just need descriptions 2015-03-04 16:40:02 -05:00
tterrag1098 795f98adfe Improve chisel container/slot code to prevent crashes/dupes
Fixes #257 #236
2015-03-04 13:25:33 -05:00
tterrag1098 5846ce6a12 Fix crash without TC installed 2015-03-01 11:45:01 -05:00
tterrag1098 5343825bf2 Force chisel durabilities to be short values, reduce obsidian default 2015-02-28 14:12:08 -05:00
tterrag1098 44c23f555e Move TC API into correct folder and switch to using the entire API 2015-02-28 10:33:55 -05:00
warlordjones c560d92099 Example Thaumcraft Aspect support, for cobblestone & cobblestone wall
There is probably a clean way to implement support for all chisel blocks, I'm just not sure how yet.
2015-02-28 14:43:26 +00:00
warlordjones ffe28a56ac Add the thaumcraft API (Slimmed down) 2015-02-28 14:32:52 +00:00
Cricket b7e32136e5 Fixed leaf naming 2015-02-27 17:18:25 -05: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 690e0699e6 Builds will now always use the BUILD_NUMBER sysenv var if it is present 2015-02-23 01:08:34 -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 284f82f487 Fix #232 2015-02-22 01:46:08 +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 4ac7f01940 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-21 02:55:16 -05:00
tterrag1098 cd22a6fb4e Make sure to call canChisel from autochisel 2015-02-21 02:54:59 -05:00
CptSpaceToaster 7741a8b4ea Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-02-19 23:27:38 -05:00
CptSpaceToaster 5245737d13 fix for gradle outright dying on IDEA... we'll see what this stomps on later 2015-02-19 23:27:24 -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 72a74f1ff6 Forgot the texture... 2015-02-19 17:14:38 -05:00
Cricket e3e7529018 Dev stuff is complete 2015-02-19 17:13:16 -05:00
tterrag1098 312a323f96 Update version to 2.3.7 2015-02-16 12:45:30 -05:00
tterrag1098 3dad2f55a0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-16 12:40:26 -05:00
tterrag1098 25a54b71e1 Fix left clicking a metal block incorrectly changing the type 2015-02-16 12:40:08 -05:00
tterrag1098 9c8364caf5 Merge pull request #229 from Adaptivity/patch-1
Update ru_RU.lang
2015-02-15 01:55:25 -05:00
Anton 86dbd54b16 Update ru_RU.lang 2015-02-15 09:49:40 +03:00
tterrag1098 55807a5f0b Fix present shift clicking 2015-02-14 22:15:45 -05:00
tterrag1098 f130011539 Update changelog 2015-02-14 21:27:46 -05:00