Compare commits

..

1 Commits

Author SHA1 Message Date
softwarenoob
1c3d6a1d7e
fix(forge): actually fix forge regex
For whatever reason, stupid me rebased the wrong branch in previous PR #3783 and didn't notice it, which contained the old egg instead.

This one actually fixes the regex and includes more debugging steps for easier troubleshooting.

Easy to view diff: <https://www.diffchecker.com/3iJ9lVzH>
2021-12-12 00:54:16 +02:00
6 changed files with 10 additions and 11 deletions

View File

@ -48,7 +48,7 @@
}, },
{ {
"name": "Server Map", "name": "Server Map",
"description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2, LostIsland", "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2",
"env_variable": "SERVER_MAP", "env_variable": "SERVER_MAP",
"default_value": "TheIsland", "default_value": "TheIsland",
"user_viewable": true, "user_viewable": true,

View File

@ -37,7 +37,7 @@
"swr": "^0.2.3", "swr": "^0.2.3",
"tailwindcss": "^2.0.2", "tailwindcss": "^2.0.2",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"xterm": "^4.15.0", "xterm": "^4.12.0",
"xterm-addon-attach": "^0.6.0", "xterm-addon-attach": "^0.6.0",
"xterm-addon-fit": "^0.4.0", "xterm-addon-fit": "^0.4.0",
"xterm-addon-search": "^0.7.0", "xterm-addon-search": "^0.7.0",

View File

@ -47,7 +47,7 @@ export default () => {
> >
<UpdateEmailAddressForm/> <UpdateEmailAddressForm/>
</ContentBox> </ContentBox>
<ContentBox css={tw`lg:ml-8 mt-8 lg:mt-0`} title={'Configure Two Factor'}> <ContentBox css={tw`xl:ml-8 mt-8 xl:mt-0`} title={'Configure Two Factor'}>
<ConfigureTwoFactorForm/> <ConfigureTwoFactorForm/>
</ContentBox> </ContentBox>
</Container> </Container>

View File

@ -97,7 +97,6 @@ export default () => {
setCpu( setCpu(
new Chart(node.getContext('2d')!, chartDefaults({ new Chart(node.getContext('2d')!, chartDefaults({
callback: (value) => `${value}% `, callback: (value) => `${value}% `,
suggestedMax: limits.cpu,
})), })),
); );
}, []); }, []);

View File

@ -8,7 +8,7 @@ import useFlash from '@/plugins/useFlash';
import { SocketEvent, SocketRequest } from '@/components/server/events'; import { SocketEvent, SocketRequest } from '@/components/server/events';
import Field from '@/components/elements/Field'; import Field from '@/components/elements/Field';
import updateStartupVariable from '@/api/server/updateStartupVariable'; import updateStartupVariable from '@/api/server/updateStartupVariable';
import { Form, Formik } from 'formik'; import { Form, Formik, FormikHelpers } from 'formik';
interface Values { interface Values {
gslToken: string; gslToken: string;
@ -44,7 +44,7 @@ const GSLTokenModalFeature = () => {
}; };
}, [ connected, instance, status ]); }, [ connected, instance, status ]);
const updateGSLToken = (values: Values) => { const updateGSLToken = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
setLoading(true); setLoading(true);
clearFlashes('feature:gslToken'); clearFlashes('feature:gslToken');

View File

@ -8040,10 +8040,10 @@ xterm-addon-web-links@^0.4.0:
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz#265cbf8221b9b315d0a748e1323bee331cd5da03" resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz#265cbf8221b9b315d0a748e1323bee331cd5da03"
integrity sha512-xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg== integrity sha512-xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg==
xterm@^4.15.0: xterm@^4.12.0:
version "4.15.0" version "4.12.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.15.0.tgz#e52038507eba7e0d36d47f81e29fe548c82b9561" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.12.0.tgz#db09b425b4dcae5b96f8cbbaaa93b3bc60997ca9"
integrity sha512-Ik1GoSq1yqKZQ2LF37RPS01kX9t4TP8gpamUYblD09yvWX5mEYuMK4CcqH6+plgiNEZduhTz/UrcaWs97gOlOw== integrity sha512-K5mF/p3txUV18mjiZFlElagoHFpqXrm5OYHeoymeXSu8GG/nMaOO/+NRcNCwfdjzAbdQ5VLF32hEHiWWKKm0bw==
y18n@^4.0.0: y18n@^4.0.0:
version "4.0.0" version "4.0.0"