mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-18 03:35:07 +00:00
Merge remote-tracking branch 'origin/master'
Conflicts: src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
This commit is contained in:
commit
2fa7d38f05
10 files changed
+631
-267
No files matched your search
@@ -419,6 +419,7 @@ public class CarvableHelper
|
||||
{
|
||||
for(CarvableVariation variation : variations)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if(variation.blockName.contains("sandstone"))
|
||||
System.out.println(variation.description);
|
||||
|
||||
@@ -426,6 +427,8 @@ public class CarvableHelper
|
||||
{
|
||||
// System.out.println(variation.description);
|
||||
}
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
list.add(new ItemStack(block, 1, variation.metadata));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user