Skip to content

Commit

Permalink
Merge pull request praecipitator#44 from zetti68/master
Browse files Browse the repository at this point in the history
upd: changed to new versions of mods (buildcraft, galacticraft)
  • Loading branch information
praecipitator authored Nov 25, 2017
2 parents 1d58229 + d66daf4 commit bc7d8c1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ buildscript {
}

repositories {
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
}
maven {
name = "chickenbones"
url = "http://chickenbones.net/maven"
Expand All @@ -28,12 +32,11 @@ repositories {

apply plugin: 'forge'



version = "0.4.8"
version = "0.4.9"
group = "de.katzenpapst.amunra" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "AmunRa-GC"
def gc_version = "3.0.12.498"
def gc_version = "3.0.12.502"
def bc_version = "7.1.22"

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -73,14 +76,13 @@ dependencies {
compile ("com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev" ) {
transitive = false
}
compile "com.mod-buildcraft:buildcraft:6.1.5:api"
compile name: "buildcraft", version: "${bc_version}", classifier: "dev"

compile files("libs/MicdoodleCore-Dev-1.7-${gc_version}.jar")
compile files("libs/Galacticraft-API-1.7-${gc_version}.jar")
compile files("libs/GalacticraftCore-Dev-${gc_version}.jar")
compile files("libs/Galacticraft-Planets-Dev-${gc_version}.jar")



}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ public int quantityDropped(Random rand)
@Override
public int damageDropped(int meta)
{
return droppedItems.getDamage();
return droppedItems != null ? droppedItems.getDamage() : super.damageDropped(meta);
}

@Override
public Item getItemDropped(int meta, Random random, int fortune)
{
return droppedItems.getItem();
return droppedItems != null ? droppedItems.getItem() : super.getItemDropped(meta, random, fortune);
}

public SubBlockDropItem setDroppedItem(Item item) {
Expand Down

0 comments on commit bc7d8c1

Please sign in to comment.