Skip to content

Commit

Permalink
Update libs
Browse files Browse the repository at this point in the history
Update to Forge 1.7.10-10.13.0.1207
Update to Clashsoft Lib 1.7.10-2.5.0
  • Loading branch information
Clashsoft committed Aug 16, 2014
1 parent 021acce commit bfcd2e3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gradle/
gradlew
gradlew.bat
bin/
build/
build/
22 changes: 10 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ targetCompatibility = 1.7

minecraft
{
version = "1.7.10-10.13.0.1189"
version = "1.7.10-10.13.0.1207"

if(file('../run').exists())
{
Expand All @@ -42,13 +42,11 @@ minecraft
}
}

task update(dependsOn:['eclipse', 'setupDevWorkspace'])

task deobfJar(type:Jar, dependsOn:'classes')
deobfJar
task devJar(type:Jar, dependsOn:'classes')
devJar
{
classifier = 'deobf'
archiveName = "${archivesBaseName}-${version}-deobf.jar"
classifier = 'dev'
archiveName = "${archivesBaseName}-${version}-dev.jar"
from ('build/classes/main')
{
include('clashsoft/brewingapi/**')
Expand All @@ -59,11 +57,11 @@ deobfJar
}
}

task sourceJar(type:Jar, dependsOn:'classes')
sourceJar
task srcJar(type:Jar, dependsOn:'classes')
srcJar
{
classifier = 'sources'
archiveName = "${archivesBaseName}-${version}-sources.jar"
classifier = 'src'
archiveName = "${archivesBaseName}-${version}-src.jar"
from ('build/sources/java')
{
include('clashsoft/brewingapi/**')
Expand All @@ -74,7 +72,7 @@ sourceJar
}
}

task buildApi(dependsOn:['build', 'sourceJar', 'deobfJar'])
task buildApi(dependsOn:['build', 'srcJar', 'devJar'])

processResources
{
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/clashsoft/brewingapi/BrewingAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import clashsoft.brewingapi.tileentity.TileEntityBrewingStand2;
import clashsoft.cslib.config.CSConfig;
import clashsoft.cslib.logging.CSLog;
import clashsoft.cslib.minecraft.CSLib;
import clashsoft.cslib.minecraft.block.CSBlocks;
import clashsoft.cslib.minecraft.command.CSCommand;
import clashsoft.cslib.minecraft.crafting.CSCrafting;
import clashsoft.cslib.minecraft.entity.CSEntities;
import clashsoft.cslib.minecraft.init.CSLib;
import clashsoft.cslib.minecraft.init.ClashsoftMod;
import clashsoft.cslib.minecraft.item.CSItems;
import clashsoft.cslib.minecraft.stack.CSStacks;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/clashsoft/brewingapi/item/ItemPotion2.java
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,7 @@ else if (potionType.isBadEffect())
String localizedDescription = I18n.getString(description);
if (localizedDescription != description)
{
localizedDescription = CSString.cutString(localizedDescription, stack.getDisplayName().length());
for (String line : CSString.lineArray(localizedDescription))
for (String line : CSString.cutString(localizedDescription, stack.getDisplayName().length()))
{
list.add("\u00a79\u00a7k" + line);
}
Expand Down

0 comments on commit bfcd2e3

Please sign in to comment.