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
803 Commits 5 Branches 98 Tags
becbb6bcadfb5a34ba7b059ad3c12e1feebd5cdd
Commit Graph
803 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
warlordjones becbb6bcad Add the thaumcraft API (Slimmed down) 2015-02-28 14:32:52 +00:00
Cricket fb2915c91c Fixed leaf naming 2015-02-27 17:18:25 -05:00
warlordjones 7a7433c31e Project Red Marble Bricks compat (Fixes #214) 2015-02-27 18:57:31 +00:00
warlordjones 61a70c7468 Custom particles respect the particles setting in the vanilla options menu (Fixes #240) 2015-02-27 15:22:14 +00:00
tterrag1098 be539034fc Fix imports 2015-02-25 04:24:11 -05:00
Cricket 2fb1ba020a Merge pull request #245 from yesimwearingpants/dev 
Added Search to CreativeTabs
 2015-02-24 20:58:13 -05:00
yesimwearingpants f42359f9db Fixed Derp 2015-02-24 20:20:31 -05:00
yesimwearingpants 6fca6cf501 Added Search To CreativeTabs 2015-02-24 20:03:04 -05:00
tterrag1098 4a3fcdb711 Fix stair placement and tooltip bugs. Closes #235 2015-02-23 13:05:24 -05:00
tterrag1098 d9a6a42d09 Improve dev special rendering system 2015-02-23 02:29:10 -05:00
tterrag1098 353b6b6fa7 Builds will now always use the BUILD_NUMBER sysenv var if it is present 2015-02-23 01:08:34 -05:00
tterrag1098 172bbacaa0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-23 00:27:23 -05:00
tterrag1098 699f419592 Remove extra PlayerSpecials registration that crashes servers 2015-02-23 00:26:42 -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
warlordjones 0ff785943f Fix #237 
Fortunatly the check isn't hardcoded :D
 2015-02-22 02:42:24 +00:00
warlordjones 777a140931 Fix #231 (The minorest of bugs :P) 2015-02-22 02:29:43 +00:00
warlordjones 3d0d2b2fe2 Prevent RC Invisiblock related crashes (Closes #238) 2015-02-22 01:50:45 +00:00
warlordjones f0d3c5a7c1 Fix #232 2015-02-22 01:46:08 +00:00
warlordjones 65f18502b1 Fix #222 2015-02-22 01:37:51 +00:00
tterrag1098 95996bd203 Add in 1.8 recipes for the 1.8 blocks 2015-02-21 18:36:26 -05:00
tterrag1098 16c7bd7bc2 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-21 02:55:16 -05:00
tterrag1098 3e84c6498c Make sure to call canChisel from autochisel 2015-02-21 02:54:59 -05:00
CptSpaceToaster bfcac6cf68 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-02-19 23:27:38 -05:00
CptSpaceToaster 379472423e fix for gradle outright dying on IDEA... we'll see what this stomps on later 2015-02-19 23:27:24 -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 dd53798785 Forgot the texture... 2015-02-19 17:14:38 -05:00
Cricket 530239fd72 Dev stuff is complete 2015-02-19 17:13:16 -05:00
tterrag1098 ba3f7eb57a Update version to 2.3.7 2015-02-16 12:45:30 -05:00
tterrag1098 5bf5ce0169 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-16 12:40:26 -05:00
tterrag1098 94dd9fc149 Fix left clicking a metal block incorrectly changing the type 2015-02-16 12:40:08 -05:00
tterrag1098 2181631c79 Merge pull request #229 from Adaptivity/patch-1 
Update ru_RU.lang
 2015-02-15 01:55:25 -05:00
Anton fa4181ede5 Update ru_RU.lang 2015-02-15 09:49:40 +03:00
tterrag1098 65b10dd0e3 Fix present shift clicking 2015-02-14 22:15:45 -05:00
tterrag1098 bc1be0b4fa Update changelog 2015-02-14 21:27:46 -05:00
tterrag1098 510a6fe0a7 Fix present localizations 2015-02-14 21:22:11 -05:00
Cricket 23fb1d0d7a Version Bump 2015-02-14 21:07:20 -05:00
Cricket f2ef3a740d Heh 2015-02-14 21:01:53 -05:00
Drullkus 828abb3ec8 Merge remote-tracking branch 'origin/dev' into dev 2015-02-13 18:44:36 -08:00
Drullkus 50bd7b5a02 Add Metal block names to Lang file. 
THIS IS GUESSWORK AND NOT TESTED
 2015-02-13 18:44:07 -08:00
Cricket e1d2afccd5 I have 2 done, I am not that creative 2015-02-12 21:33:58 -05:00
tterrag1098 6a4619ddae Whoops left a sysout 2015-02-11 22:53:05 -05:00
tterrag1098 364c1a4b44 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-02-11 22:04:11 -05:00
tterrag1098 ffc4ca9308 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 f46b42e924 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 63ea14f44e Added 16 configuration options to control the color overlay of HexBlocks 2015-02-08 23:37:56 -05:00
Steven Blom 0425ac5b4d Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing 2015-02-09 10:10:04 +10:30