Commit 8bef8001 authored by superblaubeere27's avatar superblaubeere27

Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	pom.xml
#	src/main/java/net/ccbluex/LiquidLauncher/LiquidLauncher.java
parents 481daf32 8f3c4d3c
......@@ -84,10 +84,10 @@
<txtFileVersion>${project.version}</txtFileVersion>
<fileDescription>${project.name}</fileDescription>
<copyright>Copyright CCBlueX 2017 All Rights Reserved</copyright>
<productVersion>1.0.0.0</productVersion>
<txtProductVersion>1.0.0.0</txtProductVersion>
<productVersion>1.2.7.0</productVersion>
<txtProductVersion>1.2.7.0</txtProductVersion>
<productName>${project.name}</productName>
<internalName>AppName</internalName>
<internalName>LiquidLauncher</internalName>
<originalFilename>LiquidLauncher.exe</originalFilename>
</versionInfo>
</configuration>
......
......@@ -315,6 +315,10 @@ public class LiquidLauncher {
if (tree.getModsFolder().exists()) {
tree.getModsFolder().delete();
tree.getModsFolder().mkdirs();
}
File[] modFiles = tree.getModsFolder().listFiles();
if(modFiles != null) for (File modFile : modFiles) {
modFile.delete();
}
int seis = versionMods.get(clientBuild.getMinecraftVersion()).size();
for (int i = 0; i < seis; i++) {
......@@ -343,6 +347,7 @@ public class LiquidLauncher {
assetManager.checkAssetsForVersion(mcJ.get("assets").getAsString());
// Files.copy(tree.getOptifineFile(), new File(tree.getModsFolder(), "optifine.jar"));
Files.copy(tree.getLiquidBounceFile(), new File(tree.getModsFolder(), "liquidbounce.jar"));
StringBuilder libraries = new StringBuilder();
libraries.append(libraryManager.getCPList(tree.getLibraryFolder()));
......
......@@ -35,7 +35,7 @@ public class CCToHTML {
int opened = 0;
boolean obfuscated = false;
for (int i = 0; i < colorCode.length(); i++) {
if (colorCode.charAt(i) == '§') {
if (colorCode.charAt(i) == '') {
i++;
if (colorCode.charAt(i) == 'k') {
obfuscated = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment