Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
[CI-Skip] Merge branch 'ver/1.19.2' of https://github.com/PrismarineT…
Browse files Browse the repository at this point in the history
…eam/Prismarine into dev/rewrite-chunk-system
  • Loading branch information
AlphaKR93 committed Aug 11, 2022
2 parents f3f36f3 + 0bcae09 commit 9903b76
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
18 changes: 14 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Prismarine
[![Forks](https://img.shields.io/github/forks/PrismarineTeam/Prismarine)](https://github.com/PrismarineTeam/Prismarine/network/members)
[![Stars](https://img.shields.io/github/stars/PrismarineTeam/Prismarine)](https://github.com/PrismarineTeam/Prismarine/stargazers)
[![Watchers](https://img.shields.io/github/watchers/PrismarineTeam/Prismarine)](https://github.com/PrismarineTeam/Prismarine/watchers)
[![Discord](https://img.shields.io/discord/781822976773455882?color=%235865F2&label=Discord&logo=discord)](https://discord.gg/kkqMSEVVxN)
[![Discord](https://img.shields.io/discord/781822976773455882?color=%235865F2&label=Discord&logo=discord)](https://discord.gg/CQGVqeXQQC)

[Discord](https://discord.gg/CQGVqeXQQC) - [Reddit](https://reddit.com/r/Prismarine) | [한국어](src/README/KOR.md) - **English**

Expand All @@ -31,9 +31,19 @@ A Server Platform for Minecraft: Java Edition with many improvements based on [P
- Can disable chatting report.

## Communicate
[![Discord](https://img.shields.io/discord/781822976773455882?color=%235865F2&label=Discord&logo=discord)](https://discord.gg/kkqMSEVVxN)
[![Discord](https://img.shields.io/discord/781822976773455882?color=%235865F2&label=Discord&logo=discord)](https://discord.gg/CQGVqeXQQC)

Join [Discord](https://discord.gg/kkqMSEVVxN) and let us know error and help us find how to solve it!
Join [Discord](https://discord.gg/CQGVqeXQQC) and let us know error and help us find how to solve it!

### 유용한 서버
- [Minecraft Development Dictionary (MDD)](https://discord.gg/AZwXTA9Pgx)
- Minecraft에 관련된 다양한 뉴스, 소식과 서버 개발에 대한 정보를 얻고 질문&답변 할 수 있습니다.

- [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24)
- Minecraft의 모드, 리소스팩, 셰이더에 대한 정보를 얻고 질문&답변 할 수 있습니다.

### 파트너 서버
- [혜아의 팬디코](https://discord.gg/ByHmmDSr4m)

## [#saveminecraft](https://saveminecraft.org/)
[#saveminecraft](https://saveminecraft.org/) is movement that refuses chatting report which added by Mojang Studios and Microsoft in Minecraft: Java Edition's 1.19.1(A.K.A. 1.**19.84**). #saveminecraft movement's goal is adding new permission for server admin without make minecraft's multiplay in danger, or removing chatting report. #saveminecraft movement protest peacefully and share this recognition widely. **You can view detail by clicking [here](src/SAVEMINECRAFT/ENG.md).**
Expand Down Expand Up @@ -122,7 +132,7 @@ if you want to build API and server, use `./gradlew build`. Compiled JAR file wi
If you want to make server file, use `./gradlew createReobfPaperclipJar`. If you want to make Mojmap Jar file, use `./gradlew createMojmapPaperclipJar`. file will be generated in `build/libs`.

## Licenses
[![License](https://img.shields.io/github/license/PrismarineTeam/Prismarine)](LICENSE.md)
[![License](https://img.shields.io/github/license/PurpurMC/Purpur)](LICENSE.md)

If It doesn't written in header of patch file, This project will be granted license following [MIT License](src/LICENSES/ENG/MIT.md).

Expand Down
14 changes: 12 additions & 2 deletions src/README/KOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Prismarine
=
[![License](https://img.shields.io/github/license/PrismarineTeam/Prismarine)](LICENSE.md)
[![License](https://img.shields.io/github/license/PurpurMC/Purpur)](LICENSE.md)
[![Build Prismarine](https://img.shields.io/github/workflow/status/PrismarineTeam/Prismarine/Build%20Prismarine)](https://github.com/PrismarineTeam/Prismarine/actions/workflows/build.yml)
[![Open Issues](https://img.shields.io/github/issues-raw/PrismarineTeam/Prismarine?label=issues)](https://github.com/PrismarineTeam/Prismarine/issues)
[![Open PRs](https://img.shields.io/github/issues-pr-raw/PrismarineTeam/Prismarine?label=pull%20requests)](https://github.com/PrismarineTeam/Prismarine/pulls)
Expand Down Expand Up @@ -37,6 +37,16 @@ Prismarine

한국인이라면, [네이버 카페](https://cafe.naver.com/prismarine)에 가입할수도 있습니다.

### 유용한 서버
- [Minecraft Development Dictionary (MDD)](https://discord.gg/AZwXTA9Pgx)
- Minecraft에 관련된 다양한 뉴스, 소식과 서버 개발에 대한 정보를 얻고 질문&답변 할 수 있습니다.

- [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24)
- Minecraft의 모드, 리소스팩, 셰이더에 대한 정보를 얻고 질문&답변 할 수 있습니다.

### 파트너 서버
- [혜아의 팬디코](https://discord.gg/ByHmmDSr4m)

## [#saveminecraft](https://saveminecraft.org/)
[#saveminecraft](https://saveminecraft.org/)는 Minecraft: Java Edition의 1.19.1(1.**19.84**라고도 불림)에 Mojang Studios와 Microsoft에 의해 추가된 채팅 신고 기능에 반대하는 운동입니다. saveminecraft 운동의 목표는 Minecraft의 멀티 플레이를 위험에 빠뜨리지 않고 서버의 관리자에게 권한을 부여하는 새로운 채팅 신고 기능을 추가하거나, 채팅 신고 기능을 완전히 제거하는 것입니다. saveminecraft 운동은 이 변화를 평화적으로 항의하고 인식을 확산하고자 합니다. **자세한 내용은 [여기를](../SAVEMINECRAFT/KOR.md) 확인해주시기 바랍니다.**

Expand Down Expand Up @@ -124,7 +134,7 @@ API와 서버를 빌드하려면 `./gradlew build` 를 사용하세요. 컴파
실행 가능한 서버 파일을 만드려면, `./gradlew createReobfPaperclipJar` 를 사용하세요. Mojmap Jar 파일을 만드려면 `./gradlew createMojmapPaperclipJar` 를 사용하세요. 파일은 `build/libs` 에 생성될 것입니다.

## 라이선스
[![License](https://img.shields.io/github/license/PrismarineTeam/Prismarine)](LICENSE.md)
[![License](https://img.shields.io/github/license/PurpurMC/Purpur)](LICENSE.md)

패치 파일의 헤더에 따로 명시되지 않은 한, 본 프로젝트는 [MIT License](../LICENSES/KOR/MIT.md)에 따라 라이선스가 부여됩니다.

Expand Down

0 comments on commit 9903b76

Please sign in to comment.