ARCHBLOX
/
website
1
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE

This commit is contained in:
Thomas G 2022-08-08 00:44:42 +10:00
parent 0625458279 07f70e65d0
commit 8186d0bc31
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/client/insertasset.blade.php
View File

@ -14,7 +14,7 @@
//header("location:" . "http://morblox.us/stamper/base/{$userid}.xml"); //header("location:" . "http://morblox.us/stamper/base/{$userid}.xml");
} }
//http://www.morblox.us/stamper/inseassetcollect.php?sid=433603 //http://www.morblox.us/stamper/inseassetcollect.php?sid=433603
if ($sid !== 0 && $type == 0) if ($sid != 0 && $type == "0")
{ {
header("content-type:text/xml"); header("content-type:text/xml");
$file = "http://morblox.us/stamper/sid/{$sid}.xml"; $file = "http://morblox.us/stamper/sid/{$sid}.xml";

2
resources/views/client/join.blade.php
View File

@ -76,7 +76,7 @@ end)
game:GetService("ChangeHistoryService"):SetEnabled(false) game:GetService("ChangeHistoryService"):SetEnabled(false)
game:GetService("ContentProvider"):SetThreadPool(16) game:GetService("ContentProvider"):SetThreadPool(16)
game:GetService("InsertService"):SetBaseSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=10&type=base") game:GetService("InsertService"):SetBaseSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=10&type=base")
game:GetService("InsertService"):SetUserSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=20&type=user&userid=%d") game:GetService("InsertService"):SetUserSetsUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?nsets=20&type=user&userid=%d&sid=%d)
game:GetService("InsertService"):SetCollectionUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?sid=%d") game:GetService("InsertService"):SetCollectionUrl("http://www.morblox.us/Game/Tools/InsertAsset.ashx?sid=%d")
game:GetService("InsertService"):SetAssetUrl("http://www.morblox.us/asset/?id=%d") game:GetService("InsertService"):SetAssetUrl("http://www.morblox.us/asset/?id=%d")
game:GetService("InsertService"):SetAssetVersionUrl("http://www.morblox.us/Asset/?assetversionid=%d") game:GetService("InsertService"):SetAssetVersionUrl("http://www.morblox.us/Asset/?assetversionid=%d")

4
resources/views/maintenance.blade.php
View File

@ -13,8 +13,8 @@
<h1 style="color: #ffffff">Oh Noes! ARCHBLOX is currently under maintenance.</h1> <h1 style="color: #ffffff">Oh Noes! ARCHBLOX is currently under maintenance.</h1>
<p style="color: #ffffff">ARCHBLOX will be back soon, so please be patient.</p> <p style="color: #ffffff">ARCHBLOX will be back soon, so please be patient.</p>
<br> <br>
<p style="color: #ffffff">Impaitient? <a href="https://discord.gg/nudzQ7hkWY">Join our Discord Server</a> for status updates.</p> <p style="color: #ffffff">Impatient? <a href="https://discord.gg/nudzQ7hkWY">Join our Discord Server</a> for status updates.</p>
@if (!Auth::guest() && Auth::user()->isAdmin()) @if (Auth::check() && Auth::user()->isAdmin())
<br> <br>
<p>Since you are an admin, you may access the main site during maintenance.</p> <p>Since you are an admin, you may access the main site during maintenance.</p>
<strong>Note that some features may be broken during this period.</strong> <strong>Note that some features may be broken during this period.</strong>