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
678 Commits 5 Branches 98 Tags
a3331646855219702872af63e07b8f183248b7db
Commit Graph
51 Commits
Author SHA1 Message Date
tterrag1098 7f3fabcb96 Remove extra PlayerSpecials registration that crashes servers 2015-02-23 00:26:42 -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
tterrag1098 968782ba0e Add IMC for adding/removing variations and registering oredict 2015-02-06 21:47:17 -05:00
Cricket 46f8519829 WIP 2015-01-27 09:56:28 -05:00
tterrag1098 d4523481d4 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
Cricket e20582e3e9 I just removed my bit 2015-01-19 17:07:53 -05:00
tterrag1098 331f401690 Fix crash with Twilight Forest and add helpful exceptions to Carving 2015-01-16 22:43:19 -05:00
tterrag1098 4a119d07a2 Fix WAILA compat. Update to WAILA 1.5.8a. Fix stair block descriptions. 2015-01-15 04:40:31 -05:00
tterrag1098 735b0f9d37 Clean up warnings and packages 2015-01-13 01:45:52 -05:00
tterrag1098 1920feeb1d Fix FMP integration. All normal blocks are now auto registered. 
Fixes #89
Fixes #93
 2015-01-12 23:52:53 -05:00
tterrag1098 e5000e2123 Fix warning sign rendering 2015-01-12 00:26:08 -05:00
tterrag1098 2020424e13 Fix buildscript for dev builds and unify version variable 2015-01-11 23:30:10 -05:00
CptSpaceToaster dc4495e0b7 Finalizing AntiBlock prototype 2015-01-11 22:37:51 -05:00
CptSpaceToaster bbc33601f8 Merge branch 'dev' into antiblocks 2015-01-11 22:30:31 -05:00
CptSpaceToaster 7e1e437bbf Prototyped Antiblocks 2015-01-11 20:53:24 -05:00
tterrag1098 cc984eb615 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-01-11 17:21:59 -05:00
tterrag1098 64e390fc1d Fix autochisel inventory syncing and change autochisel block bounds 2015-01-11 17:21:53 -05:00
warlordjones fb225ee244 Switch Road Lines to meta 2015-01-11 21:54:36 +00:00
warlordjones 9d868864f9 Import Organisation 2015-01-11 20:59:16 +00:00
warlordjones 8ab7e53f28 Redo changes to 'Chisel.java' from my branch 2015-01-11 20:56:07 +00:00
warlordjones 61b0135715 Fix the Blood Magic Blank Rune compat blocks 2015-01-11 20:25:34 +00:00
tterrag1098 2259ecfba4 Move all block registration to preinit to prevent creative tab issues 2015-01-10 17:21:16 -05:00
tterrag1098 cce5e65b08 Add new variation compat. Mostly untested. 2015-01-10 04:39:10 -05:00
tterrag1098 71e839831f Chisel item refactor. 
Add chisel slot to autochisel. 
Refactor slot tooltip and valid items.
 2015-01-09 01:50:32 -05:00
Cricket eba862f9a2 Fixed formatting... 2015-01-08 19:42:57 -05:00
Cricket d9f442242b sarcasm and added something for a friend 2015-01-08 19:32:20 -05:00
tterrag1098 fe01b3ac02 Finish Hex Blocks (Fixes #98). Change block class names (warlordjones). 
Fix items not loading
 2015-01-08 18:34:47 -05:00
tterrag1098 f103e924cd Move all recipes to features. Clean up recipes. Fix worldgen registering 2015-01-08 16:31:13 -05:00
tterrag1098 0e413b3c54 Fix creative tabs to work with new system 2015-01-08 15:27:15 -05:00
tterrag1098 bbeb991027 Begin major feature structor overhaul. Just recipes left to do. 2015-01-08 05:46:10 -05:00
tterrag1098 66573c7d25 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-08 02:00:03 -05:00
tterrag1098 4cc4723e81 Add basic auto chisel model. Still needs texture and animated stuff. 2015-01-08 01:59:50 -05:00
Drullkus 9884f84696 Add fix for 106. Fixes #106 2015-01-07 22:33:27 -08:00
tterrag1098 4cfcc874dc The great format and clean up. IMPORTANT: Read below. 
All devs and contributors should use the provided formatter settings. 
If your IDE does not support the format, the rules are simple, it is the
default java formatting rules, with 200char line lengths and 1 extra
line after class definitions.
 2015-01-07 19:50:18 -05:00
tterrag1098 76f3893db8 Fix left-click chiseling. 
Remove chisel harvest levels. 
Both chisels in 1 ID
 2015-01-07 19:43:45 -05:00
Cricket f8b87c8539 Projected changelog and version bump 2015-01-06 20:38:54 -05:00
Cricket ef506e57a9 Chisel left click redone, Thanks tterrag 2015-01-06 20:29:22 -05:00
Cricket ec2313dcb2 and... imports 2015-01-05 19:15:35 -05:00
Cricket 75adbfe1d1 textures 2015-01-05 19:14:13 -05:00
Cricket 48a66e6e9e 1.8 generation added, fixed #91 and #84 2015-01-05 18:17:57 -05:00
Cricket 6c7f569d4d Added AlchemicalWizardry support 2015-01-02 21:22:46 -05:00
Cricket c25879ddbc Tab organization 2015-01-02 18:52:53 -05:00
Cricket 996be4b4e0 Diamond chisel is working 2015-01-02 16:46:57 -05:00
Arona Jones 4ae5b962d7 Move RC compat into postInit, make sure it happens after RC is loaded... 2015-01-01 00:24:37 +00:00
Arona Jones 5571282dac Bump version to 2.2.1 2014-12-27 14:58:08 +01:00
Cricket d182a6af8c 200th Commit and made it better for loading 2014-12-24 12:16:19 -05:00
Arona Jones e78cf1fe65 Begin work on Chiselable Thaumcraft Arcane Stone :D 2014-12-24 15:50:31 +01:00
Cricket b9025ad1ae Just pushing my work so far 2014-12-23 20:16:31 -05:00
Arona Jones a9c94e95e5 Bump version. We did agree on 2.2.0, right? 2014-12-19 14:30:25 +00:00
Arona Jones 67bfa67b39 Import Opts 2014-12-16 22:27:44 +00:00