Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 1 4 5 #16

Merged
merged 2 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oxlauncher",
"version": "1.4.4",
"version": "1.4.5",
"description": "OxLAUNCHER is simple and powerful tool to download and manage minecraft modpacks. Based on GDLauncher",
"keywords": [
"minecraft",
Expand Down
2 changes: 1 addition & 1 deletion src/app/desktop/views/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ const Login = () => {
`}
>
<center>
<a onClick={() => dispatch(openModal('ChangeLogs'))}>v. 1.4.4</a>
<a onClick={() => dispatch(openModal('ChangeLogs'))}>v. 1.4.5</a>
</center>
</div>
<div
Expand Down
18 changes: 1 addition & 17 deletions src/common/modals/AddInstance/Content.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ const Content = ({
setStep={setStep}
setModpack={setModpack}
/>,
<FTBModpacks
setVersion={setVersion}
setStep={setStep}
setModpack={setModpack}
/>,
<Import
setVersion={setVersion}
setModpack={setModpack}
Expand Down Expand Up @@ -131,25 +126,14 @@ const Content = ({
Modrinth
</Radio.Button>
<Radio.Button value={4}>
<img
src={ftbIcon}
css={`
margin-right: 4px;
cursor: pointer;
width: 20px;
`}
/>
FTB
</Radio.Button>
<Radio.Button value={5}>
<FontAwesomeIcon
icon={faArchive}
css={`
margin-right: 4px;
cursor: pointer;
`}
/>
Zip
Импорт
</Radio.Button>
</Radio.Group>
</div>
Expand Down
24 changes: 13 additions & 11 deletions src/common/modals/ChangeLogs/changeLog.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
module.exports = {
new: [
{
header: 'Поддержка Quilt'
// {
// header: 'Поддержка Quilt'
//content: "на главном экране лаунчера"
},
{
header: 'Каталог модов и сборок Modrinth'
}
// },
// {
// header: 'Каталог модов и сборок Modrinth'
// }
// {
// header: 'Поддержка Discord RPC',
// content: '(отображение активности в лаунчере)',
// advanced: { cm: '4eec052e' }
// }
],
improvements: [
// {
// header: 'Увеличена ширина превью изображений',
// content: 'на вкладке Скриншоты'
// },
{
header: 'Удалена вкладка FTB в меню добавления сборок'
},
// {
// header: 'Кнопка открытия меню скриншотов',
// content: 'в контекстном меню сборок'
Expand Down Expand Up @@ -50,7 +49,10 @@ module.exports = {
],
bugfixes: [
{
header: 'Зависание окна настроек сборки'
header: 'Автовход в Offline профиль'
},
{
header: 'Отображение кнопки Далее в меню Импорта'
},
// {
// header: 'Автоматическая установка Java'
Expand Down
2 changes: 1 addition & 1 deletion src/common/modals/Settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default function Settings() {
font-size: 16px;
`}
>
OxLAUNCHER 1.4.4
OxLAUNCHER 1.4.5
</span>
<p>by Proxwian</p>
<div
Expand Down
3 changes: 2 additions & 1 deletion src/common/reducers/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ export function switchToFirstValidAccount(id) {
const accounts = _getAccounts(state);
const currentAccountId = id || state.app.currentAccountId;
let found = null;
let offline = null;
for (let i = 0; i < accounts.length; i += 1) {
if (found || accounts[i].selectedProfile.id === currentAccountId)
continue; //eslint-disable-line
Expand Down Expand Up @@ -865,7 +866,7 @@ export function loginWithAccessToken(redirect = true) {
const state = getState();
const currentAccount = _getCurrentAccount(state);
const { accessToken, accountType, clientToken, selectedProfile } = currentAccount;
if (!accessToken) throw new Error();
//if (!accessToken) throw new Error();
try {
console.log(accountType)
switch (accountType) {
Expand Down
Loading