Skip to content

Commit

Permalink
Merge branch '2.2.x/1.19.2/master' into 2.2.x/1.19.4/master
Browse files Browse the repository at this point in the history
  • Loading branch information
MBatt1 committed Aug 16, 2024
2 parents a83c21b + caf9077 commit a3933ea
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 42 deletions.
2 changes: 0 additions & 2 deletions .github/FUNDING.yml

This file was deleted.

38 changes: 21 additions & 17 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
MIT License
The MIT License (MIT)
=====================

Copyright (c) 2022 Immortal Devs
Copyright © 2024 ImmortalDevs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the “Software”), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
24 changes: 10 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Paradise Lost
[![Code license (GNU GPL 3.0)](https://img.shields.io/github/license/devs-immortal/Paradise-Lost)](https://github.com/devs-immortal/Paradise-Lost/blob/0.2.0/1.19/master/LICENSE.md)
![Minecraft 1.19.2](https://img.shields.io/badge/Minecraft-1.19.2-brightgreen)
[![Discord](https://img.shields.io/discord/770691727568404521.svg?logoColor=FFFFFF&logo=discord&color=7289DA)](https://discord.com/invite/wmMa47n)
[![Code license (MIT)](https://img.shields.io/github/license/devs-immortal/Paradise-Lost)](https://github.com/devs-immortal/Paradise-Lost/blob/0.2.0/1.19/master/LICENSE.md)
[![Asset license (Unlicensed)](https://img.shields.io/badge/assets%20license-All%20Rights%20Reserved-red.svg?style=flat)](https://creativecommons.org/licenses/by-sa/4.0/)
[![Github all releases](https://img.shields.io/github/downloads/kalucky0/The-Aether/total.svg?logoColor=FFFFFF&logo=github)](https://github.com/devs-immortal/The-Aether/releases/)

**Is this official?**

Expand All @@ -24,14 +25,9 @@ An explorer must explore.

You can download the mod on [Modrinth](https://modrinth.com/mod/paradise-lost), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/paradise-lost), or in the [releases tab](https://github.com/devs-immortal/Paradise-Lost/releases) on Github.

**The Aether repository:** [GildedGames/The-Aether](https://github.com/Gilded-Games/The-Aether)
**Soundtrack:** [Aether Reborn - Volume 1](https://sunsette.bandcamp.com/album/aether-reborn-volume-1)

## Support
[![Discord](https://img.shields.io/discord/770691727568404521.svg?logoColor=FFFFFF&logo=discord&color=7289DA)](https://discord.com/invite/wmMa47n)
[![Support on Patreon](https://img.shields.io/badge/Support%20on-Patreon-orange?logoColor=FFFFFF&logo=patreon)](https://www.patreon.com/kalucky0)
[![Support on Ko-Fi](https://img.shields.io/badge/Support%20on-Ko--Fi-blue?logoColor=FFFFFF&logo=ko-fi)](https://ko-fi.com/kalucky0)

You can support our work by [making a pledge](https://www.patreon.com/kalucky0) today helping fund development and gaining access to special perks. You can also support the Aether project and **Gilded Games** on [their Patreon](https://www.patreon.com/GildedGames).
**The Aether repository:** [GildedGames/The-Aether](https://github.com/Gilded-Games/The-Aether)

## Translations
[![Crowdin](https://badges.crowdin.net/aether/localized.svg)](https://crowdin.com/project/aether)
Expand All @@ -42,16 +38,16 @@ Paradise Lost makes use of crowd sourced translations.

## Gallery

| <img src="https://user-images.githubusercontent.com/53229958/216715850-84a79b78-9def-419b-be31-eff317d8ca26.png" width="570"> | <img src="https://user-images.githubusercontent.com/53229958/216715905-de7a097c-df7e-41d5-936b-339be2632a5b.png" width="570"> |
| <img src="https://immortaldevs.net/2024-05-05_13.00.26.png" width="570"> | <img src="https://immortaldevs.net/2024-05-05_12.56.59.png" width="570"> |
| --- | --- |
| <img src="https://user-images.githubusercontent.com/53229958/216715924-f32b4a2d-5968-4cbe-8053-b61ec50b8609.png" width="570"> | <img src="https://user-images.githubusercontent.com/53229958/216715944-887d2120-8c04-4bee-88eb-d37654e648eb.png" width="570"> |
| <img src="https://user-images.githubusercontent.com/53229958/216715953-4177791b-32b2-4bb5-a1ab-571e93819d3f.png" width="570"> | <img src="https://user-images.githubusercontent.com/53229958/216715966-197e1456-318a-4b59-a166-5d3a75ea02cd.png" width="570"> |
| <img src="https://immortaldevs.net/2024-05-05_12.24.35.png" width="570"> | <img src="https://immortaldevs.net/2024-05-05_12.22.24.png" width="570"> |
| <img src="https://immortaldevs.net/2024-05-05_13.04.22.png" width="570"> | <img src="https://immortaldevs.net/2024-05-05_13.04.12.png" width="570"> |

## License information
Created by Immortal Devs.\
Inspired by [Gilded Games' The Aether](https://github.com/Gilded-Games/The-Aether), which uses the GNU GPLv3 license.\
Assets are all rights are reserved by Immortal Devs.

You can find out more information about the license [here](https://github.com/devs-immortal/Paradise-Lost/blob/0.2.0/1.19/master/LICENSE.md).
You can find out more information about the license [here](https://github.com/devs-immortal/Paradise-Lost/blob/2.1.0/1.19.2/master/LICENSE.md).

<a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api" target="_blank"><img alt="Fabric API - Mods - Minecraft - CurseForge" src="https://i.imgur.com/Ol1Tcf8.png" height="48"></a>&nbsp;&nbsp;<a href="https://www.curseforge.com/minecraft/mc-mods/trinkets" target="_blank"><img alt="Trinkets (Fabric) - Mods - Minecraft - CurseForge" src="https://kalucky0.b-cdn.net/trinkets.webp" height="48"></a>
<a href="https://curseforge.com/minecraft/mc-mods/fabric-api" target="_blank"><img alt="Fabric API - Mods - Minecraft - CurseForge" src="https://i.imgur.com/Ol1Tcf8.png" height="48"></a>&nbsp;&nbsp;<a href="https://curseforge.com/minecraft/mc-mods/trinkets" target="_blank"><img alt="Trinkets (Fabric) - Mods - Minecraft - CurseForge" src="https://immortaldevs.net/trinkets.webp" height="48"></a>
17 changes: 8 additions & 9 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

Found a very dangerous bug that could cause serious harm to users? Use this little checklist to see if its lethal!

- It allows access to the user's PC when joining a minecraft server or network.
- It allows access to the user's PC when joining a Minecraft server or network.
- It can cause a blue screen of death or serious corruption to the user's PC.
- It can cause a lawsuit or other legal issue.

If one or more of these items fit your match. Please see our supported versions.

## Supported Versions

| Version | Supported? | End of Support Date |
|--------- |------------ |--------------------- |
| DEV\* | | Never |
| BETA | | Not Decided Yet |
| ALPHA | | 2/5/2022 |
| Version | Supported? | End of Support Date |
|---------|------------|---------------------|
| DEV\* | | Never |
| BETA || Not Decided Yet |
| ALPHA | | 2/5/2022 |


## Reporting a Vulnerability
Expand All @@ -26,10 +26,9 @@ If one or more of these items fit your match. Please see our supported versions.
You can report a bug or important issue at the following contacts:

- Discord
+ kalucky0#2137
+ azazelthedemonlord#2563
+ kalucky0
- Email
+ kalucki23@gmail.com
+ contact@kalucky0.dev

Please provide as much information as you can, and we prefer Discord as we can respond faster.

Expand Down

0 comments on commit a3933ea

Please sign in to comment.