Skip to content

Commit

Permalink
Merge branch 'master' into anvil-saving
Browse files Browse the repository at this point in the history
  • Loading branch information
Snowiiii committed Dec 30, 2024
2 parents 6d49ba8 + 6f7433e commit 24acb3f
Show file tree
Hide file tree
Showing 235 changed files with 3,550 additions and 2,967 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --all-targets --all-features --no-default-features
- run: cargo clippy --all-targets --all-features
build_and_test:
name: Build project and test
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -77,4 +77,4 @@ jobs:
- uses: actions/checkout@v4
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --release --all-targets --all-features --no-default-features
- run: cargo clippy --release --all-targets --all-features
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ There are several ways you can contribute to Pumpkin:

### Docs

The Documentation of Pumpkin can be found at <https://snowiiii.github.io/Pumpkin/>
The Documentation of Pumpkin can be found at <https://pumpkinmc.org/>

**Tip: [typos](https://github.com/crate-ci/typos) is a great Project to detect and automatically fix typos

Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ members = [
version = "0.1.0"
edition = "2021"

[profile.dev.package."*"]
opt-level = 3

[profile.dev]
opt-level = 1
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM rust:1-alpine3.20 AS builder
FROM rust:1-alpine3.21 AS builder
ARG GIT_VERSION=Docker
ENV GIT_VERSION=$GIT_VERSION
ENV RUSTFLAGS="-C target-feature=-crt-static -C target-cpu=native"
ENV RUSTFLAGS="-C target-feature=-crt-static"
RUN apk add --no-cache musl-dev

WORKDIR /pumpkin
Expand All @@ -16,10 +16,10 @@ RUN --mount=type=cache,sharing=private,target=/pumpkin/target \
# strip debug symbols from binary
RUN strip pumpkin.release

FROM alpine:3.20
FROM alpine:3.21

# Identifying information for registries like ghcr.io
LABEL org.opencontainers.image.source=https://github.com/Snowiiii/Pumpkin
LABEL org.opencontainers.image.source=https://github.com/Pumpkin-MC/Pumpkin

RUN apk add --no-cache libgcc

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

</div>

[Pumpkin](https://snowiiii.github.io/Pumpkin/) is a Minecraft server built entirely in Rust, offering a fast, efficient,
[Pumpkin](https://pumpkinmc.org/) is a Minecraft server built entirely in Rust, offering a fast, efficient,
and customizable experience. It prioritizes performance and player enjoyment while adhering to the core mechanics of the game.

![image](https://github.com/user-attachments/assets/7e2e865e-b150-4675-a2d5-b52f9900378e)
Expand Down Expand Up @@ -79,6 +79,7 @@ and customizable experience. It prioritizes performance and player enjoyment whi
- [x] Particles
- [x] Chat
- [x] Commands
- [x] OP Permission
- Proxy
- [x] Bungeecord
- [x] Velocity
Expand All @@ -87,15 +88,15 @@ Check out our [Github Project](https://github.com/users/Snowiiii/projects/12/vie

## How to run

See our [Quick Start](https://snowiiii.github.io/Pumpkin/about/quick-start.html) Guide to get Pumpkin running
See our [Quick Start](https://pumpkinmc.org/about/quick-start.html) Guide to get Pumpkin running

## Contributions

Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md)

## Docs

The Documentation of Pumpkin can be found at https://snowiiii.github.io/Pumpkin/
The Documentation of Pumpkin can be found at https://pumpkinmc.org/

## Communication

Expand Down
1 change: 1 addition & 0 deletions assets/entities.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ services:
pumpkin:
build: .
ports:
- 25565:25565
- "25565:25565"
volumes:
- ./data:/pumpkin
stdin_open: true
tty: true
103 changes: 0 additions & 103 deletions extractor/build.gradle.kts

This file was deleted.

14 changes: 0 additions & 14 deletions extractor/gradle.properties

This file was deleted.

7 changes: 0 additions & 7 deletions extractor/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit 24acb3f

Please sign in to comment.