Skip to content

Commit 0a71541

Browse files
authored
Merge pull request #1764 from ebkr/develop
Release 3.2.0 (Develop)
2 parents c0c6c5d + b35b59f commit 0a71541

File tree

85 files changed

+1983
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1983
-983
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
### 3.2.0
2+
#### Major changes
3+
- You can now preview a mod's README, CHANGELOG, and dependencies all within the Online section.
4+
- Profile management now belongs in the bottom left of the screen.
5+
- You can use this to:
6+
- Change profile
7+
- Export profile
8+
- Import local mods
9+
10+
#### Games added
11+
- ANEURISM IV
12+
- Lost Skies
13+
- Labyrinthine
14+
115
### 3.1.58
216
#### Games added
317
- Schedule 1

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "r2modman",
3-
"version": "3.1.58",
3+
"version": "3.2.0",
44
"description": "A simple and easy to use mod manager for many games using Thunderstore.",
55
"productName": "r2modman",
66
"author": "ebkr",
@@ -45,9 +45,11 @@
4545
"fflate": "^0.8.2",
4646
"floating-vue": "^1.0.0-beta.19",
4747
"fs-extra": "^8.1.0",
48+
"github-markdown-css": "^5.7.0",
4849
"glob-parent": "^6.0.2",
4950
"highlight.js": "^10.4.1",
5051
"lodash.debounce": "^4.0.8",
52+
"modern-normalize": "^3.0.1",
5153
"moment": "^2.29.1",
5254
"node-ipc": "^9.1.1",
5355
"quasar": "^1.14.7",
@@ -57,6 +59,7 @@
5759
"tar": "^6.1.11",
5860
"trim-newlines": "^4.0.2",
5961
"unzipper": "^0.10.5",
62+
"uuid-js": "^0.7.5",
6063
"vue-class-component": "^7.2.2",
6164
"vue-i18n": "^8.0.0",
6265
"vue-property-decorator": "^8.3.0",

quasar.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ module.exports = configure(function(/* ctx */) {
8888
// Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer
8989
devServer: {
9090
https: false,
91-
port: 8080,
91+
port: 9020,
9292
open: true // opens browser window automatically
9393
},
9494

src-electron/main-process/electron-main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function createWindow() {
4444
nodeIntegration: true,
4545
nodeIntegrationInWorker: true,
4646
webSecurity: false,
47-
contextIsolation: false,
47+
contextIsolation: false
4848
},
4949
icon: path.join(__dirname, 'icon.png'),
5050
autoHideMenuBar: process.env.PROD

src/App.vue

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<template>
22
<div>
3-
<router-view v-if="visible"/>
3+
<main>
4+
<router-view v-if="visible"/>
5+
</main>
46
<ErrorModal />
57
</div>
68
</template>
@@ -46,6 +48,16 @@ import InstallationRuleApplicator from './r2mm/installing/default_installation_r
4648
import GenericProfileInstaller from './r2mm/installing/profile_installers/GenericProfileInstaller';
4749
import UtilityMixin from './components/mixins/UtilityMixin.vue';
4850
import ErrorModal from './components/modals/ErrorModal.vue';
51+
import { provideStoreImplementation } from './providers/generic/store/StoreProvider';
52+
import baseStore from './store';
53+
54+
document.addEventListener('auxclick', e => {
55+
const target = e.target! as any;
56+
if (target.localName == 'a') {
57+
LinkProvider.instance.openLink(target.getAttribute("href"))
58+
}
59+
e.preventDefault();
60+
}, false)
4961
5062
@Component({
5163
components: {
@@ -107,6 +119,9 @@ export default class App extends mixins(UtilityMixin) {
107119
beforeCreate() {
108120
FsProvider.provide(() => new NodeFs());
109121
122+
const store = baseStore();
123+
provideStoreImplementation(() => store);
124+
110125
ProfileProvider.provide(() => new ProfileImpl());
111126
LogOutputProvider.provide(() => LogOutput.getSingleton());
112127
@@ -128,3 +143,15 @@ export default class App extends mixins(UtilityMixin) {
128143
129144
}
130145
</script>
146+
147+
<style lang="scss">
148+
html {
149+
overflow: hidden;
150+
overflow-y: auto;
151+
}
152+
153+
main {
154+
display: grid;
155+
grid-template-rows: 100vh;
156+
}
157+
</style>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import VersionNumber from '../model/VersionNumber';
22

33
export default class ManagerInformation {
4-
public static VERSION: VersionNumber = new VersionNumber('3.1.58');
4+
public static VERSION: VersionNumber = new VersionNumber('3.2.0');
55
public static IS_PORTABLE: boolean = false;
66
public static APP_NAME: string = "r2modman";
77
}
55.6 KB
Loading
39.1 KB
Loading
76.1 KB
Loading

src/components/ExpandableCard.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<keep-alive>
3-
<div class="">
3+
<div>
44
<div class='row-card is-shadowless' :class="[{'disabled-card': !enabled}, {'row-card--expanded': visible}]">
5-
<div @click='toggleVisibility()' class='cursor-pointer' ref="card-expansion">
5+
<div @click='toggleVisibility()' class='cursor-pointer'>
66
<header class='card-header is-shadowless' :id='id'>
77
<div class='card-header-icon mod-logo' v-if="image !== ''">
88
<figure class='image is-48x48 image-parent'>

0 commit comments

Comments
 (0)