Skip to content

Commit

Permalink
💾 2024-08-15 15:50:24 DC-AN
Browse files Browse the repository at this point in the history
  • Loading branch information
Funasitien committed Aug 15, 2024
1 parent ec3be10 commit 3d32888
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 30 deletions.
6 changes: 5 additions & 1 deletion .obsidian/appearance.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"accentColor": "#ff5757",
"baseFontSize": 15,
"cssTheme": "Minimal"
}
8 changes: 4 additions & 4 deletions .obsidian/core-plugins-migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"canvas": true,
"outgoing-link": true,
"tag-pane": true,
"properties": false,
"properties": true,
"page-preview": true,
"daily-notes": true,
"templates": true,
Expand All @@ -16,13 +16,13 @@
"slash-command": false,
"editor-status": true,
"bookmarks": true,
"markdown-importer": false,
"markdown-importer": true,
"zk-prefixer": false,
"random-note": false,
"random-note": true,
"outline": true,
"word-count": true,
"slides": false,
"audio-recorder": false,
"audio-recorder": true,
"workspaces": false,
"file-recovery": true,
"publish": false,
Expand Down
4 changes: 4 additions & 0 deletions .obsidian/core-plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@
"canvas",
"outgoing-link",
"tag-pane",
"properties",
"page-preview",
"daily-notes",
"templates",
"note-composer",
"command-palette",
"editor-status",
"bookmarks",
"markdown-importer",
"random-note",
"outline",
"word-count",
"audio-recorder",
"file-recovery"
]
1 change: 1 addition & 0 deletions .obsidian/page-preview.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
45 changes: 30 additions & 15 deletions .obsidian/workspace-mobile.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"state": {
"type": "markdown",
"state": {
"file": "SUMMARY.md",
"file": "CONTRIBUTE.md",
"mode": "source",
"source": false
}
Expand Down Expand Up @@ -144,6 +144,18 @@
"type": "bookmarks",
"state": {}
}
},
{
"id": "0debdf563e5b1c0c",
"type": "leaf",
"state": {
"type": "all-properties",
"state": {
"sortOrder": "frequency",
"showSearch": false,
"searchQuery": ""
}
}
}
],
"currentTab": 0
Expand All @@ -158,7 +170,7 @@
"state": {
"type": "backlink",
"state": {
"file": "SUMMARY.md",
"file": "CONTRIBUTE.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
Expand All @@ -175,7 +187,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "SUMMARY.md",
"file": "CONTRIBUTE.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
Expand All @@ -187,7 +199,7 @@
"state": {
"type": "outline",
"state": {
"file": "SUMMARY.md"
"file": "CONTRIBUTE.md"
}
}
}
Expand All @@ -201,26 +213,29 @@
"canvas:Create new canvas": false,
"daily-notes:Open today's daily note": false,
"templates:Insert template": false,
"command-palette:Open command palette": false
"command-palette:Open command palette": false,
"audio-recorder:Start/stop recording": false,
"markdown-importer:Open format converter": false,
"random-note:Open random note": false
}
},
"active": "afcc7ca3d1fe121e",
"lastOpenFiles": [
"LICENSE.md",
"BOOTH.md",
"SUMMARY.md",
"README.md",
"PANEL.md",
"CONTRIBUTE.md",
"about-us/worlds.md",
"ressources/how-to-play.md",
"about-us/concept.md",
"about-us/values.md",
"about-us/organization.md",
"about-us/games.md",
"ressources/lobby.md",
"BOOTH.md",
"CONTRIBUTE.md",
"LICENSE.md",
"images/demo-studio.png",
"about-us/worlds.md",
"README.md",
"SUMMARY.md",
"about-us/concept.md",
"Untitled",
"ressources/how-to-play.md",
"ressources/lobby.md",
"about-us/values.md",
"images/4.jpeg",
"images/7.jpeg",
"images",
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 👋 How to contribute
We are welcome to any contribution, from typo fixes to news pages ! We just ask you to :

- Respect our work. This documentation is quite dificult to stral as it only talk about us - but please leave propre credit if you use our work
- Plese write proprely, and use Gitbook syntaxe. We do not support Github or Obsidian flavored markdown, **even if obsidian is supported by our wiki and even really advised.** Obisdian is fast n' good.
- Respect our work. This documentation is quite dificult to stole as it only talk about us - but please leave propre credit if you use our work
- Plese write proprely, and use Gitbook syntaxe. We do not support Github or Obsidian flavored markdown, **even if obsidian is supported by our wiki and even really advised.** We envourage typo fixes, are we arn't english :)

## 🪨 About Obsidian
This repo is by defaukt set up to use obsidian. Some plugins, like git sync integration or icons for files are alerady installed and configured. If you use Git integration, do not forget to add your own credientials (saved in a separated .env file in your device and not synced with github).
4 changes: 4 additions & 0 deletions about-us/concept.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ The first aim of **DEMOCRAFT** is to allow players to play together. We always f
Bedrock and Java edition are really different, with interfaces, gameplay and mechanics which are good one some editions and bad on others. So we choose to add a bit of magic, **a ressource pack** to our server.

The first twist is that we don't have one ressource pack. Actually, we have **2** differents ressource pack, one for each edition which advantages on the other.

## ☢️ Facing newer versions
Instead of using 1.8 like all most know mini games server, we had to use the latest versions of the game to support bedrock clients. While this bring us new weapons, features and blocs to build with, we also have to use the latest pvp mechanics in our minigames, *and so revamp them a li'tle bit* to make them fun

1 change: 0 additions & 1 deletion about-us/games.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ Both with 1.8 and 1.20 PVP, fight against your friends with different kits to se
One Map. One Kit. Plenty of players to kill and one kill streak to keep.
## 🪅 Arcade
The famous arcade minigames such as Quake, TntTag, Porphunt...

## 🪓 UHC
The clasic battle royale on minecraft, *always better than fortnite*.
1 change: 1 addition & 0 deletions about-us/organization.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ icon: ✨️


![DEMOCRAFT STUDIO Text Logo](/images/demo-studio.png)
This page is Work In Progress, to talk about our association, DEMOCRAFT STUDIOS.
2 changes: 1 addition & 1 deletion about-us/values.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ Today, it's complicated for french minecraft servers to be economically independ
---
###### 💜 A **HUGE** thanks to **Vaati** which give us an incredible infrastructure that we could'nt dream of.

If you read the doc so far, just take a minute to thanks vaati on our discord or while our panel <3
If you read the doc so far, just take a minute to thanks vaati on our discord or while our panel <3 It's yet simple but also the better thing you can do to support us !
6 changes: 3 additions & 3 deletions about-us/worlds.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ icon: 🧭
We quickly discovered that players get bored while playing minigames alone - which is a bit logic due to how they work - and so leave the server as they have nothing else to do on it. That's why we created the Open World(s), also called planets, where player can play alone *or with friend* on a more vanilla server with survival, buildings and crafting.
## 🪴 Survival (SMP)
The survival planet (or SMP) is a calm planet where chill and build are most than encoraged. There is an economy on the SMP - rubys - which can be won throught daily quests and spent on a local shop (hdv). Note that the SMP features a custom terain generation, and two new ores: silver and amber.
## ⚔️ Faction
## ⚔️ Faction <mark style="color: red;">WIP</mark>
The faction planet is the most dangerous one ; with inhabitants ready to fight and guilds. On this planet, there is also two custom ores: the wynarium (in blue) ans the jade. You can use Saphirs, the curency of the server, to buy items and stuff to the admin shop and open crates. Like a faction
## 🏝 Skyblock
How to make open world without talking about a Skyblock ? You can buy and sell stuff with Jade, the skyblock's custom currency (which is not the same as the factions jade)
## 🏔 Oneblock
## 🏔 Oneblock <mark style="color: red;">WIP</mark>
The brother of our Skyblock, the oneblock. Also featuring his own economy with Spinelle (the yellow crystal)
## ⏳️And Then?
But that's not all! Our first goal is to finish our **Realms** system, which will allow anybody to buy his own custom server, with a simple ingame panel to control it. We are working for our partner, **Vaatigames** to create the buying tool (which is harder to make that it seems)...

We also have a final slot (which correspond to the last of our 6 cristal, the orange one). This one should be more original, and will be able soon! (when they will be actual players that want it)
We also have a final slot (which correspond to the last of our 6 cristal, the orange one). This one should be more original, and will be able soon! (when they will be actual players that want it - and player on the server actually)
2 changes: 1 addition & 1 deletion ressources/how-to-play.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ You cannot natively add custom server to console edition of Minecraft. You have
{% endhint %}

1. Click on Play, then on Servers
2. Go to the bottom of the server list and click on add a server. As the server adress, use <mark style="color: red;">bedrock.democraft.fr</mark>. For the server port, we use the default `19132` port. Like Java, you can choose any namr for the server.
2. Go to the bottom of the server list and click on add a server. As the server adress, use <mark style="color: red;">bedrock.democraft.fr</mark>. For the server port, we use the default `19132` port. Like Java, you can choose any name for the server.
3. Click on continue. You may asked if you are realy sure about playing a server not manager by mojang, but you are, so say yes. Then, you can click on the server and click on the `connect` button. Accept the ressource pack, wait a bit and you are in!

4 changes: 2 additions & 2 deletions ressources/lobby.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 🏙 How the Lobby work

## 📱The DEMOPHONE
This is the master tool of every DEMOCRAFT player. With this little guy, you can travel across the server, create groups, have cool cosmetics, and more informations about the server
This is the master tool of every DEMOCRAFT player. With this little guy, you can travel across the server, create groups, have cool cosmetics, and know more informations about the server

{% hint style="info" %}
**The DEMOPHONE was so cool...**

...That we decided to recode it ! Pur next DEMOPHONE will be aviable on **any** server, <mark style="color: red;">included the planets</mark>, and will allow you to do even better stuff! See the devlog channel on our discors for some spoils!
...That we decided to recode it ! Our next DEMOPHONE will be aviable on **any** server, <mark style="color: red;">included the planets</mark>, and will allow you to do even better stuff! See the devlog channel on our discors for some spoils!
{% endhint %}

## 👨 The NPC's
Expand Down

0 comments on commit 3d32888

Please sign in to comment.