Merge upstream and probably introduce a zillion errors

This commit is contained in:
Vincent Lee committed 2015-12-14 16:38:07 -06:00
commit 5211ed9149
164 files changed
+5198 -2141

No files matched your search

@@ -30,14 +30,14 @@ public class SimpleWikiProvider implements IWikiProvider {
public SimpleWikiProvider(String name, String urlBase, boolean lowercase) {
this(name, urlBase, "%20", lowercase);
}
public SimpleWikiProvider(String name, String urlBase, String replacement) {
this.name = name;
this.urlBase = urlBase;
this.replacement = replacement;
this.lowercase = false;
lowercase = false;
}
public SimpleWikiProvider(String name, String urlBase, String replacement, boolean lowercase) {
this.name = name;
this.urlBase = urlBase;
@@ -73,7 +73,7 @@ public class SimpleWikiProvider implements IWikiProvider {
String name = getBlockName(world, pos);
if(name == null)
return null;
if(lowercase) {
return String.format(urlBase, name.toLowerCase().replaceAll(" ", replacement));
} else {