upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-13 00:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
112 Commits 5 Branches 98 Tags
fca1a06ecaeef9d252eae463303748bfe0bdf9a8
Commit Graph
112 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fenn fca1a06eca Manually added in EoD's PR for mcmod.info 2014-09-15 11:31:51 +01:00
Fenn 1a12b59568 Merge pull request #55 from EoD/remove-chisel-sandstone-duplicates 
Remove chisel sandstone duplicates
 2014-09-15 11:29:15 +01:00
Fenn 1b8114c820 Fixed the bracing 2014-09-15 11:27:15 +01:00
Fenn 49ade553f0 Fix the derps from that commit, i hate git. 2014-09-15 11:25:33 +01:00
Fenn 1dd65fd97a Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/info/jbcs/minecraft/chisel/Chisel.java
 2014-09-15 11:22:41 +01:00
Fenn 108e5ceccc WIP left click chisel stuff 2014-09-15 11:14:40 +01:00
Fenn 652d905ca1 Merge pull request #47 from EoD/fix-item-remapping-v2 
Fix item remapping v2
 2014-09-15 11:14:26 +01:00
Fenn 00c81ac21e Merge pull request #52 from EoD/localise-gui 
Localise chisel gui elements
 2014-09-15 11:13:14 +01:00
Fenn 0a788b7727 Merge pull request #48 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-09-15 11:12:10 +01:00
EoD 164d24fa74 remove duplicate sandstone blocks 
followup of 1d11c221621a36d0855b63b7549076a4c6b61474
 2014-09-14 20:02:42 +02:00
EoD 385ed88d91 add compatbility recipes for wrong sandstone block 2014-09-14 20:02:42 +02:00
EoD e058360427 Fixes Pokefenn/Chisel#39 
The duplicate blocks from chisel should be removed in a future commit.
 2014-09-14 20:02:42 +02:00
EoD 22ef94c4b9 Localise chisel gui elements 2014-09-11 02:13:41 +02:00
D-dur 2a9d3860eb Update zh_CN.lang 
Translation for Laboratory Block.
 2014-09-10 15:52:27 +08:00
EoD d98c38aaf9 Closes Pokefenn/Chisel#36 
adding handling for MissingMapping so renamed blocks don't disappear
after a world upgrade
 2014-09-09 19:03:09 +02:00
EoD 480b6c3629 utitilies: add replaceTags(), update getName() 
replaceTags() is helpful for finding remapped items.
Adding a getName(Item item) and using replaceTags() in old getName(Block
block)
 2014-09-09 18:59:40 +02:00
EoD ffcbf444cd Revert "Manually added EoDs PR." 
This reverts commit 752bb63900e67f7242accdef0799ae7bd2a7c9aa due to some
missing changes
 2014-09-09 18:57:43 +02:00
Fenn 376c485f3c Fix for crash with HEE 2014-09-06 18:02:20 +01:00
Fenn 98ae948926 Merge pull request #40 from Adaptivity/patch-2 
Update ru_RU.lang
 2014-09-06 14:37:46 +01:00
Fenn 3f16a666ef Manually added EoDs PR. 2014-09-06 11:46:36 +01:00
Fenn 6b1ec65beb Merge pull request #42 from Lordmau5/master 
Changes to the left-clicking with the Chisel in-hand...
 2014-09-06 11:35:52 +01:00
Fenn be36008786 Merge pull request #45 from GravitasShortfall/master 
Added "Laboratory Block"
 2014-09-06 11:28:53 +01:00
GravitasShortfall 51677db15f Added "Laboratory Block" 
Set of laboratory/hi-tech-themed blocks with corresponding textures
(textures made by myself).
 2014-09-05 17:10:46 +01:00
Konata Izumi cac56fcdb5 Remove unnecessary "ClassNotFound"-stacktrace (mod compat.) 2014-09-02 00:36:59 +02:00
Konata Izumi b17aae93f9 Ye... the block update is needed here ... 
Also version bump
 2014-08-31 13:55:12 +02:00
Konata Izumi 653a1df6c9 Changes to the left-clicking with the Chisel in-hand... 
Basicly, the Chisel as item can't break ANY blocks anymore, it's all handled through Forge-events.
I don't think there are needs to check, if the config-option for this is enabled / disabled, so the item can still break blocks in the world... Seems useless..
 2014-08-31 13:37:01 +02:00
Anton a1cec7aefb Update ru_RU.lang 
With help of MailGik, Russian translation is 100% complete.
 2014-08-28 22:45:13 +04:00
Fenn e6bf5f8dd6 1.5.6b 2014-08-24 10:51:53 +01:00
Fenn 2ec448b9de Fixed some recipe derps. 2014-08-24 10:49:06 +01:00
Fenn 162f458bb3 Merge pull request #35 from ViKaleidoscope/patch-1 
Create zh_CN.lang
 2014-08-19 11:34:50 +01:00
Fenn 6ffb71b831 Sound fix. 2014-08-19 10:53:37 +01:00
Princess 80f8962a8d Create zh_CN.lang 
Localization for 1.7.10. :)
 2014-08-16 02:00:19 +08:00
Fenn dc3639565a Bluepower support added for Marble 2014-08-13 16:58:37 +01:00
Fenn 02a7be514d Derped on that. 2014-08-11 13:46:17 +01:00
Fenn c4557bab11 Fix for ProRed marble & chisel crafting config 2014-08-11 13:35:49 +01:00
Fenn 08e41f1c84 Moved to post init to be safe. 2014-08-10 12:15:32 +01:00
Fenn d844b446e4 That -should- be a fix for PR marble stuff. 
Since it's now in scala i had to do a work around.
 2014-08-10 12:12:39 +01:00
Fenn 0701588032 1.5.6a updated :p 2014-08-08 17:21:41 +01:00
Fenn 4152cbfd43 Fixed the stained glass carving issues. 2014-08-08 17:18:09 +01:00
Fenn 6489e7eb25 Merge pull request #32 from Parker8283/waila 
Added Waila Integration
 2014-08-08 15:44:55 +01:00
Parker 88edbebedc Added Waila Integration 2014-08-08 09:09:26 -04:00
Fenn f944e1dc8b Forced normal render of Lavastone. 2014-08-07 20:58:26 +01:00
Fenn af58f026d6 Fixed configuration and other stuff. 2014-07-26 09:17:49 +01:00
Fenn a8152e626f Seperated configurations into a new class. 2014-07-17 22:05:29 +01:00
Pokefenn 0eccfcda10 Merge pull request #28 from xbony2/patch-1 
Goodbye .DS_Store
 2014-07-17 16:10:46 +01:00
xbony2 fca815d17c Goodbye .DS_Store 
This is so mac users like me can send pull requests without the .DS_Store file that are auto-generatored by OS-X, since most people don't those. See: http://en.wikipedia.org/wiki/.DS_Store
 2014-07-17 09:34:01 -04:00
Fenn 32dbd9a4aa 1.5.6 and also recipes 2014-07-12 11:54:00 +01:00
Fenn 3d19ced0d9 Woolen Clay ;) 2014-07-12 11:11:34 +01:00
Fenn 9143e19089 Config for mossy blocks being made from stone 2014-07-12 10:54:47 +01:00
Fenn 6a39b1f230 Paperwalls? Paperwalls! 2014-07-11 17:39:36 +01:00