Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-08-03 14:41:12 -06:00
commit a39802cb4e
19 changed files with 241 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/scripts/components/server/ServerConsole.tsx
View file

@ -7,7 +7,7 @@ import ServerContentBlock from '@/components/elements/ServerContentBlock';
import ServerDetailsBlock from '@/components/server/ServerDetailsBlock';
import isEqual from 'react-fast-compare';
import PowerControls from '@/components/server/PowerControls';
import { EulaModalFeature } from 'feature/index';
import { EulaModalFeature, JavaVersionModalFeature } from 'feature/index';
import ErrorBoundary from '@/components/elements/ErrorBoundary';
import Spinner from '@/components/elements/Spinner';
@ -60,6 +60,7 @@ const ServerConsole = () => {
{eggFeatures.includes('eula') &&
<React.Suspense fallback={null}>
<EulaModalFeature/>
<JavaVersionModalFeature/>
</React.Suspense>
}
</div>