Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dscalzi committed Nov 11, 2018
1 parent e6b9728 commit affacbf
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 87 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ script:
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder:wine \
/bin/bash -c "node -v && npm ci && npm run travislinux"
/bin/bash -c "node -v && npm ci && npm run cilinux"
else
npm run travisdarwin
npm run cidarwin
fi
before_cache:
Expand Down
Binary file removed app/assets/fonts/Inconsolata-Bold.ttf
Binary file not shown.
Binary file removed app/assets/fonts/Inconsolata-Regular.ttf
Binary file not shown.
16 changes: 0 additions & 16 deletions app/assets/js/assetguard.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/**
* AssetGuard
*
* This module aims to provide a comprehensive and stable method for processing
* and downloading game assets for the WesterosCraft server. Download meta is
* for several identifiers (categories) is stored inside of an AssetGuard object.
* This meta data is initially empty until one of the module's processing functions
* are called. That function will process the corresponding asset index and validate
* any exisitng local files. If a file is missing or fails validation, it will be
* placed into a download queue (array). This queue is wrapped in a download tracker object
* so that essential information can be cached. The download tracker object is then
* assigned as the value of the identifier in the AssetGuard object. These download
* trackers will remain idle until an async process is started to process them.
*
* @module assetguard
*/
// Requirements
const AdmZip = require('adm-zip')
const async = require('async')
Expand Down
2 changes: 2 additions & 0 deletions app/settings.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@
</div>
<div id="settingsAboutButtons">
<a href="https://github.com/WesterosCraftCode/ElectronLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Source (GitHub)</a>
<!-- The following must be included in third-party usage. -->
<!-- <a href="https://github.com/WesterosCraftCode/ElectronLauncher" id="settingsAboutSourceButton" class="settingsAboutButton">Original Source</a> -->
<a href="http://www.westeroscraft.com/forum/support.40/" id="settingsAboutSupportButton" class="settingsAboutButton">Support</a>
<a href="#" id="settingsAboutDevToolsButton" class="settingsAboutButton">DevTools Console</a>
</div>
Expand Down
141 changes: 92 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 18 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,36 @@
{
"name": "westeroscraftlauncher",
"version": "1.0.5",
"description": "Custom modded launcher for Westeroscraft",
"productName": "WesterosCraft Launcher",
"description": "Modded Minecraft Launcher",
"author": "Daniel Scalzi (https://github.com/dscalzi/)",
"license": "UNLICENSED",
"homepage": "https://github.com/WesterosCraftCode/ElectronLauncher",
"bugs": {
"url": "https://github.com/WesterosCraftCode/ElectronLauncher/issues"
},
"private": true,
"main": "index.js",
"scripts": {
"start": "electron index.js",
"travislinux": "electron-builder --linux --win",
"travisdarwin": "electron-builder --mac",
"cilinux": "electron-builder --linux --win",
"cidarwin": "electron-builder --mac",
"dist": "SET ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true & electron-builder",
"dist:win": "npm run dist -- --win --x64",
"dist:mac": "npm run dist -- --mac",
"dist:linux": "npm run dist -- --linux --x64",
"dist:deb": "npm run dist -- --linux deb --x64",
"dist:all": "npm run dist -- -wl --x64",
"lint": "eslint --config .eslintrc.json --ignore-pattern app/assets/js/scripts/*.js . && eslint --config .eslintrc.scripts.json app/assets/js/scripts"
},
"engines": {
"node": "10.x.x"
},
"repository": {
"type": "git",
"url": "git+https://github.com/WesterosCraftCode/ElectronLauncher.git"
},
"author": "Daniel Scalzi (https://github.com/dscalzi/)",
"license": "UNLICENSED",
"private": true,
"bugs": {
"url": "https://github.com/WesterosCraftCode/ElectronLauncher/issues"
},
"homepage": "http://www.westeroscraft.com/",
"dependencies": {
"adm-zip": "^0.4.11",
"async": "^2.6.1",
"discord-rpc": "discordjs/RPC",
"ejs": "^2.6.1",
"ejs-electron": "^2.0.3",
"electron-updater": "^3.2.2",
"electron-updater": "^3.2.3",
"github-syntax-dark": "^0.5.0",
"jquery": "^3.3.1",
"mkdirp": "^0.5.1",
Expand All @@ -48,8 +42,12 @@
},
"devDependencies": {
"electron": "^3.0.8",
"electron-builder": "^20.33.2",
"eslint": "^5.8.0"
"electron-builder": "^20.34.0",
"eslint": "^5.9.0"
},
"repository": {
"type": "git",
"url": "git+https://github.com/WesterosCraftCode/ElectronLauncher.git"
},
"build": {
"appId": "westeroscraftlauncher",
Expand Down Expand Up @@ -84,7 +82,7 @@
"target": "AppImage",
"maintainer": "Daniel Scalzi",
"vendor": "WesterosCraft",
"synopsis": "Custom modded launcher for WesterosCraft",
"synopsis": "Custom Launcher for WesterosCraft",
"description": "Custom launcher which allows users to join WesterosCraft. All mods, configurations, and updates are handled automatically.",
"category": "Game"
},
Expand Down

0 comments on commit affacbf

Please sign in to comment.