Damage control pass 1

This commit is contained in:
Daniel Scalzi 2017-05-17 03:31:42 -04:00
parent 33a4e49401
commit 75af2726db
3 changed files with 124 additions and 159 deletions

View File

@ -9,65 +9,74 @@
"revision": "0.0.1", "revision": "0.0.1",
"server-ip": "mc.westeroscraft.com", "server-ip": "mc.westeroscraft.com",
"mc-version": "1.11.2", "mc-version": "1.11.2",
"main-class": "TBD", "modules": [
"libraries": [
{ {
"name": "net.minecraftforge.forge.forge-universal:1.11.2-13.20.0.2228", "id": "MODNAME",
"required": true, "name": "Mod Name version 1.11.2",
"type": "forgemod",
"_comment": "If no required is given, it will default to true. If a def(ault) is not give, it will default to true. If required is present it always expects a value.",
"required": {
"value": false,
"def": false
},
"artifact": {
"size": 1234,
"MD5": "e71e88c744588fdad48d3b3beb4935fc",
"path": "forgemod path is appended to {basepath}/mods",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/somemod.jar"
}
},
{
"_comment": "Forge is a special instance of library.",
"id": "net.minecraftforge.forge.forge-universal:1.11.2-13.20.0.2228",
"name": "Minecraft Forge 1.11.2-13.20.0.2228",
"type": "forge",
"artifact": { "artifact": {
"size": 4123353, "size": 4123353,
"MD5": "5b9105f1a8552beac0c8228203d994ae", "MD5": "5b9105f1a8552beac0c8228203d994ae",
"path": "net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar", "path": "net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar",
"url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar" "url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-universal.jar"
}, }
"launch-args": ["--tweakClass cpw.mods.fml.common.launcher.FMLTweaker"]
}, },
{ {
"name": "net.optifine.optifine:1.11.2_HD_U_B8", "_comment": "library path is appended to {basepath}/libraries",
"required": true, "id": "net.optifine.optifine:1.11.2_HD_U_B8",
"name": "Optifine 1.11.2 HD U B8",
"type": "library",
"artifact": { "artifact": {
"size": 2050307, "size": 2050307,
"MD5": "c18c80f8bfa2a440cc5af4ab8816bc4b", "MD5": "c18c80f8bfa2a440cc5af4ab8816bc4b",
"path": "optifine/OptiFine/1.11.2_HD_U_B8/OptiFine-1.11.2_HD_U_B8.jar", "path": "optifine/OptiFine/1.11.2_HD_U_B8/OptiFine-1.11.2_HD_U_B8.jar",
"url": "http://optifine.net/download.php?f=OptiFine_1.11.2_HD_U_B8.jar" "url": "http://optifine.net/download.php?f=OptiFine_1.11.2_HD_U_B8.jar"
}
},
{
"id": "chatbubbles",
"name": "Chat Bubbles 1.11.2",
"type": "litemod",
"required": {
"value": false
}, },
"launch-args": []
}
],
"forgemods": [
{
"name": "MODNAME",
"required": true,
"artifact": { "artifact": {
"size": 1234, "size": 37838,
"MD5": "e71e88c744588fdad48d3b3beb4935fc", "MD5": "0497a93e5429b43082282e9d9119fcba",
"path": "/path/to/lib/modname.jar", "path": "litemod path is appended to {basepath}/mods/{mc-version}",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar" "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/mod_chatBubbles-1.0.1_for_1.11.2.litemod"
} },
} "_comment": "Any module can declare submodules, even submodules.",
], "sub-modules": [
"litemods": [ {
{ "id": "customRegexes",
"name": "MODNAME", "name": "Custom Regexes for Chat Bubbles",
"required": true, "type": "file",
"artifact": { "artifact": {
"size": 1234, "size": 331,
"MD5": "e71e88c744588fdad48d3b3beb4935fc", "MD5": "f21b4b325f09238a3d6b2103d54351ef",
"path": "/path/to/lib/modname.jar", "path": "file path is appended to {basepath}",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar" "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/customRegexes.txt"
} }
} }
], ]
"files": [
{
"name": "FILENAME",
"required": true,
"artifact": {
"size": 1234,
"MD5": "e71e88c744588fdad48d3b3beb4935fc",
"path": "/path/to/lib/filename.jar",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.7.10/launchwrapper-1.11.jar"
}
} }
] ]
} }

View File

@ -1,140 +1,96 @@
<<<<<<< HEAD <!DOCTYPE html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" />
<title>Westeroscraft Launcher</title>
<script src="./assets/js/script.js"></script>
<link type="text/css" rel="stylesheet" href="./assets/css/styles.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="assets/css/global.css">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script> <link rel="stylesheet" type="text/css" href="assets/css/header.css">
<link rel="stylesheet" type="text/css" href="assets/css/nav.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="assets/css/global.css">
<link rel="stylesheet" type="text/css" href="assets/css/header.css">
<link rel="stylesheet" type="text/css" href="assets/css/nav.css">
</head>
<style> <style>
.inner_div{ .inner_div{
width:100%; width:100%;
background-color: black; background-color: black;
border: 5px solid #a02d2a; border: 5px solid #a02d2a;
} }
</style> </style>
</head>
<body> <body>
<div id="header_container">
<div id="header_seal_container">
<img id="header_seal" src="./assets/images/WesterosSealSquare.png"/>
<div id="header_container">
<div id="header_seal_container">
<img id="header_seal" src="./assets/images/WesterosSealSquare.png"/>
</div>
<div id="header_img_container">
<img id="header_img" src="./assets/images/WCTextCrop.png" />
</div>
<div id="header_social_container">
<a href="http://facebook.com/westeroscraft" class="header_social_link">
<img src="./assets/images/facebook.png" class="header_social_img" />
</a>
<a href="http://reddit.com/r/westeroscraft" class="header_social_link">
<img src="./assets/images/reddit.png" class="header_social_img" />
</a>
<a href="http://twitter.com/westeroscraft" class="header_social_link">
<img src="./assets/images/twitter.png" class="header_social_img" />
</a>
</div>
</div> </div>
<div id="header_img_container">
<img id="header_img" src="./assets/images/WCTextCrop.png" />
</div>
<div id="header_social_container">
<a href="http://facebook.com/westeroscraft" class="header_social_link">
<img src="./assets/images/facebook.png" class="header_social_img" />
</a>
<a href="http://reddit.com/r/westeroscraft" class="header_social_link">
<img src="./assets/images/reddit.png" class="header_social_img" />
</a>
<a href="http://twitter.com/westeroscraft" class="header_social_link">
<img src="./assets/images/twitter.png" class="header_social_img" />
</a>
</div>
</div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-2 col-sm-2">
<div class="col-md-2 col-sm-2"> <div class="row">
<div class="col-md-3 col-sm-3">
<div class="row"> <img class="player_icon" src="https://minotar.net/helm/pufferboss.png">
<div class="col-md-3 col-sm-3">
<img class="player_icon" src="https://minotar.net/helm/pufferboss.png">
</div>
<div class="col-md-9 col-sm-9">
<p class="input_text">Email</p>
<input class="input" id="EMAIL">
<p class="input_text">Password</p>
<input type="password" id="PASSWORD" class="input" />
</div>
</div> </div>
<div class="col-md-9 col-sm-9">
</div> <p class="input_text">Email</p>
<input class="input" id="EMAIL">
<div class="col-md-10 col-sm-10"> <p class="input_text">Password</p>
<input type="password" id="PASSWORD" class="input" />
<ul>
<li><a href="">NEWS</a></li>
<li><a href="">MAP</a></li>
<li><a href="">MODS</a></li>
<li><a href="">FAQ</a></li>
<li><a href="">LOG</a></li>
<li><a href="">SETTINGS</a></li>
</ul>
<br>
<br>
<div class="inner_div">
<p class="title"> Post title </p>
<p class="subtite">Posted by: PERSON 23.4.17</p>
<pre style="text-align: left; word-break: break-all; overflow-wrap: break-word;"> Hello WesterosCraft Builders and Honored Guests! As you know,
progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and
are calling all builders to the capital!
There has been a lot of progress with Kingslanding planning and we are happy to...
</pre>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-10 col-sm-10">
<ul>
<li><a href="" class="">NEWS</a></li>
<li><a href="">MAP</a></li>
<li><a href="">MODS</a></li>
<li><a href="">FAQ</a></li>
<li><a href="">LOG</a></li>
<li><a href="">SETTINGS</a></li>
</ul>
<br>
<br>
<div class="inner_div">
<p class="title"> Post title </p>
<p class="subtite">Posted by: PERSON 23.4.17</p>
<pre style="text-align: left; word-break: break-all; overflow-wrap: break-word;"> Hello WesterosCraft Builders and Honored Guests! As you know,
progress on Kingslanding had stalled, but no longer -- we want to finish this big, beautiful, city in style and
are calling all builders to the capital!
There has been a lot of progress with Kingslanding planning and we are happy to...
</pre>
</div>
</div>
</div> </div>
</div>
</body>
<!--
</body>
</html> </html>
=======
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -176,5 +132,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>-->
>>>>>>> refs/remotes/origin/master

View File

@ -21,6 +21,7 @@
"async": "^2.3.0", "async": "^2.3.0",
"electron": "^1.6.5", "electron": "^1.6.5",
"extract-zip": "=1.6.0", "extract-zip": "=1.6.0",
"find-java-home": "^0.1.4",
"jQuery": "^1.7.4", "jQuery": "^1.7.4",
"mojang": "^0.4.1", "mojang": "^0.4.1",
"promise": "^7.1.1", "promise": "^7.1.1",