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

merging test into main #6

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions .cpanel.yml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
deployment:
tasks:
- export DEPLOYPATH=/home3/thewaff2/public_html/web
---
deployment:
tasks:
- export DEPLOYPATH=/home3/thewaff2/public_html/web
- /bin/cp -R public $DEPLOYPATH
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.history/
.vscode/
93 changes: 47 additions & 46 deletions annoucenments.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>announcement's</title>
<!--style sheet link-->
<link rel="stylesheet" href="./css/annoucements.css">
<!--icon link-->
<link rel="icon" href="./resources/css/images/Icon.png" type="image/icon type">
<!--adding a font-->
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,200;1,200&display=swap" rel="stylesheet">
</head>
<!--adding content to the page-->

<body class="all">
<div class="navbar">
<div class="dropdown">
<button class="dropbtn">-<br>-<br>-
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="./index.html">Home</a>
<a href="./members.html">Members</a>
<a href="./fetured.html">Featured</a>
<a href="./annoucenments.html">Announcements</a>
<a href="./tutorials.html">Tutorials</a>
<a href="./world-downloads.html">Downloads</a>
<!-- <a href="bluemap.thewafflecraft.com" target="blank">3D Map</a> -->
</div>
</div>
</div>
<h1 class="title">Important Announcements</h1>
<p><strong>Wafflecraft</strong> has been updated to the latest release of Minecraft, <strong><a class="lnk"
href="https://www.minecraft.net/en-us/article/minecraft-java-edition-1-16-5"
target="blank"><i>1.16.5,</i></a></strong> but you can still join using Minecraft version
<strong>1.16.4</strong>
</p>
<p>Until the 1.17 release the wafflecraft server will be a modded minecraft server just add <a
href="https://www.mediafire.com/file/sm32a6bjwf38jdx/modded+survival+attempt+2.zip/file" target="_blank"
class="lnk">these mods</a> to the Curseforge launcher</p>
<p>The Wafflecraft survival server is back online in version 1.17</p>
</body>

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>announcement's</title>
<!--style sheet link-->
<link rel="stylesheet" href="./css/style.css">
<!--icon link-->
<link rel="icon" href="./resources/css/images/Icon.png" type="image/icon type">
<!--adding a font-->
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,200;1,200&display=swap" rel="stylesheet">
</head>
<!--adding content to the page-->

<body class="all">
<div class="navbar">
<div class="dropdown">
<button class="dropbtn">-<br>-<br>-
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="./index.html">Home</a>
<a href="./members.html">Members</a>
<a href="./fetured.html">Featured</a>
<a href="./annoucenments.html">Announcements</a>
<a href="./tutorials.html">Tutorials</a>
<a href="./world-downloads.html">Downloads</a>
<a href="./serverInfo.html">Server Info</a>
<!-- <a href="bluemap.thewafflecraft.com" target="blank">3D Map</a> -->
</div>
</div>
</div>
<h1 class="index-title">Important Announcements</h1>
<p><strong>Wafflecraft</strong> has been updated to the latest release of Minecraft, <strong><a class="lnk"
href="https://www.minecraft.net/en-us/article/minecraft-java-edition-1-16-5"
target="blank"><i>1.16.5,</i></a></strong> but you can still join using Minecraft version
<strong>1.16.4</strong>
</p>
<p>Until the 1.17 release the wafflecraft server will be a modded minecraft server just add <a
href="https://www.mediafire.com/file/sm32a6bjwf38jdx/modded+survival+attempt+2.zip/file" target="_blank"
class="lnk">these mods</a> to the Curseforge launcher</p>
<p>The Wafflecraft survival server is back online in version 1.17</p>
</body>

</html>
143 changes: 0 additions & 143 deletions css/annoucements.css

This file was deleted.

Empty file modified css/content/2020-12-31_14.10.03.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/2021-07-18_08.24.49.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/Icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/image.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/layered-waves-haikei.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/stacked-waves-haikei.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/the_power_of_the_fungus.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/village.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified css/content/waffle.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading