Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Sefiraat/Netheopoiesis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: SlimefunGuguProject/Netheopoiesis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jun 13, 2022

  1. 翻译

    ybw0014 committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    2535e2d View commit details
  2. [ImgBot] Optimize images

    *Total -- 628.72kb -> 559.25kb (11.05%)
    
    /images/textures/plants/viney/Viney Red Full.png -- 0.89kb -> 0.54kb (39.21%)
    /images/textures/plants/viney/Viney Orange Stage 4.png -- 0.88kb -> 0.54kb (38.4%)
    /images/textures/plants/viney/Viney Red Stage 2.png -- 0.88kb -> 0.54kb (38.26%)
    /images/textures/plants/viney/Viney Red Stage 4.png -- 0.88kb -> 0.54kb (38.26%)
    /images/textures/plants/viney/Viney Blue Stage 3.png -- 0.88kb -> 0.54kb (38.2%)
    /images/textures/plants/viney/Viney Orange Stage 3.png -- 0.88kb -> 0.54kb (38.13%)
    /images/textures/plants/viney/Viney Red Stage 3.png -- 0.88kb -> 0.54kb (38.06%)
    /images/textures/plants/viney/Viney Orange Stage 2.png -- 0.87kb -> 0.54kb (37.99%)
    /images/textures/plants/viney/Viney Cyan Stage 4.png -- 0.87kb -> 0.54kb (37.99%)
    /images/textures/plants/viney/Viney Purple Stage 4.png -- 0.87kb -> 0.54kb (37.99%)
    /images/textures/plants/viney/Viney Purple Full.png -- 0.87kb -> 0.54kb (37.78%)
    /images/textures/plants/viney/Viney Blue Stage 2.png -- 0.87kb -> 0.54kb (37.71%)
    /images/textures/plants/viney/Viney Purple Stage 2.png -- 0.87kb -> 0.54kb (37.64%)
    /images/textures/plants/viney/Viney Blue Stage 4.png -- 0.87kb -> 0.54kb (37.36%)
    /images/textures/plants/viney/Viney Green Stage 3.png -- 0.86kb -> 0.54kb (37.29%)
    /images/textures/plants/viney/Viney Cyan Stage 2.png -- 0.86kb -> 0.54kb (37%)
    /images/textures/plants/viney/Viney Blue Full.png -- 0.86kb -> 0.54kb (36.72%)
    /images/textures/plants/viney/Viney Orange Full.png -- 0.85kb -> 0.54kb (36.21%)
    /images/textures/plants/viney/Viney Purple Stage 3.png -- 0.85kb -> 0.54kb (36.21%)
    /images/textures/plants/viney/Viney Cyan Stage 3.png -- 0.85kb -> 0.54kb (36.13%)
    /images/textures/plants/viney/Viney Cyan Full.png -- 0.85kb -> 0.54kb (36.06%)
    /images/textures/plants/viney/Viney Green Stage 2.png -- 0.85kb -> 0.54kb (36.06%)
    /images/textures/plants/viney/Viney Yellow Stage 3.png -- 0.84kb -> 0.54kb (35.84%)
    /images/textures/plants/viney/Viney Yellow Stage 4.png -- 0.84kb -> 0.54kb (35.61%)
    /images/textures/plants/viney/Viney Green Full.png -- 0.84kb -> 0.54kb (35.61%)
    /images/textures/plants/viney/Viney Yellow Stage 2.png -- 0.84kb -> 0.54kb (35.39%)
    /images/textures/plants/viney/Viney Green Stage 4.png -- 0.83kb -> 0.54kb (35.09%)
    /images/textures/plants/spikey/Spikey Red Stage 2.png -- 0.76kb -> 0.50kb (34.65%)
    /images/textures/plants/viney/Viney Yellow Full.png -- 0.83kb -> 0.54kb (34.63%)
    /images/textures/plants/spikey/Spikey Red Stage 4.png -- 0.76kb -> 0.50kb (34.57%)
    /images/textures/plants/viney/Viney Purple Stage 1.png -- 0.83kb -> 0.54kb (34.47%)
    /images/textures/plants/spikey/Spikey Red Stage 3.png -- 0.76kb -> 0.50kb (34.4%)
    /images/logo/logo_white_large.png -- 29.45kb -> 19.42kb (34.03%)
    /images/textures/plants/viney/Viney Orange Stage 1.png -- 0.82kb -> 0.54kb (33.69%)
    /images/textures/plants/spikey/Spikey Cyan Stage 3.png -- 0.75kb -> 0.50kb (33.64%)
    /images/textures/plants/viney/Viney Cyan Stage 1.png -- 0.82kb -> 0.54kb (33.53%)
    /images/textures/plants/viney/Viney Blue Stage 1.png -- 0.81kb -> 0.54kb (33.37%)
    /images/textures/plants/viney/Viney Red Stage 1.png -- 0.81kb -> 0.54kb (33.37%)
    /images/textures/plants/spikey/Spikey Blue Full.png -- 0.75kb -> 0.50kb (33.29%)
    /images/textures/plants/spikey/Spikey Green Full.png -- 0.74kb -> 0.50kb (32.94%)
    /images/textures/plants/spikey/Spikey Green Stage 4.png -- 0.74kb -> 0.50kb (32.85%)
    /images/textures/plants/spikey/Spikey Purple Stage 4.png -- 0.74kb -> 0.50kb (32.67%)
    /images/textures/plants/spikey/Spikey Blue Stage 4.png -- 0.74kb -> 0.50kb (32.59%)
    /images/textures/plants/spikey/Spikey Purple Stage 3.png -- 0.74kb -> 0.50kb (32.5%)
    /images/textures/plants/spikey/Spikey Cyan Stage 4.png -- 0.74kb -> 0.50kb (32.41%)
    /images/textures/plants/spikey/Spikey Blue Stage 3.png -- 0.74kb -> 0.50kb (32.32%)
    /images/textures/plants/spikey/Spikey Cyan Full.png -- 0.74kb -> 0.50kb (32.14%)
    /images/textures/plants/spikey/Spikey Blue Stage 2.png -- 0.73kb -> 0.50kb (31.96%)
    /images/textures/plants/spikey/Spikey Cyan Stage 2.png -- 0.73kb -> 0.50kb (31.78%)
    /images/textures/plants/spikey/Spikey Purple Stage 2.png -- 0.73kb -> 0.50kb (31.59%)
    /images/textures/plants/spikey/Spikey Yellow Stage 4.png -- 0.73kb -> 0.50kb (31.5%)
    /images/textures/plants/spikey/Spikey Orange Stage 4.png -- 0.73kb -> 0.50kb (31.41%)
    /images/textures/plants/spikey/Spikey Yellow Stage 3.png -- 0.72kb -> 0.50kb (31.04%)
    /images/textures/plants/spikey/Spikey Purple Full.png -- 0.72kb -> 0.50kb (30.95%)
    /images/textures/plants/viney/Viney Yellow Stage 1.png -- 0.77kb -> 0.53kb (30.87%)
    /images/textures/plants/spikey/Spikey Orange Stage 2.png -- 0.72kb -> 0.50kb (30.85%)
    /images/textures/plants/spikey/Spikey Orange Stage 3.png -- 0.72kb -> 0.50kb (30.57%)
    /images/textures/plants/spikey/Spikey Red Full.png -- 0.72kb -> 0.50kb (30.57%)
    /images/textures/plants/spikey/Spikey Green Stage 3.png -- 0.72kb -> 0.50kb (30.48%)
    /images/textures/plants/viney/Viney Green Stage 1.png -- 0.78kb -> 0.54kb (30.36%)
    /images/textures/plants/spikey/Spikey Yellow Stage 2.png -- 0.71kb -> 0.50kb (29.81%)
    /images/textures/plants/spikey/Spikey Yellow Full.png -- 0.71kb -> 0.50kb (29.32%)
    /images/textures/plants/spikey/Spikey Green Stage 2.png -- 0.71kb -> 0.50kb (29.22%)
    /images/textures/plants/spikey/Spikey Orange Full.png -- 0.70kb -> 0.50kb (28.83%)
    /images/logo/logo_small.png -- 15.20kb -> 11.13kb (26.77%)
    /images/logo/logo_large.png -- 51.26kb -> 38.12kb (25.63%)
    /images/textures/plants/spikey/Spikey Blue Stage 1.png -- 0.68kb -> 0.51kb (24.39%)
    /images/textures/plants/spikey/Spikey Purple Stage 1.png -- 0.68kb -> 0.52kb (24.25%)
    /images/textures/plants/spikey/Spikey Red Stage 1.png -- 0.68kb -> 0.52kb (24.21%)
    /images/logo/logo_small_icon_only.png -- 13.75kb -> 10.50kb (23.65%)
    /images/textures/plants/spikey/Spikey Orange Stage 1.png -- 0.67kb -> 0.52kb (23.14%)
    /images/logo/logo_small_icon_only_inverted.png -- 16.55kb -> 12.78kb (22.77%)
    /images/textures/plants/spawning/Spawning Purple Full.png -- 0.67kb -> 0.52kb (22.42%)
    /images/textures/plants/spikey/Spikey Cyan Stage 1.png -- 0.65kb -> 0.51kb (21.11%)
    /images/textures/plants/spikey/Spikey Yellow Stage 1.png -- 0.63kb -> 0.51kb (19.35%)
    /images/textures/plants/spikey/Spikey Green Stage 1.png -- 0.62kb -> 0.52kb (17.11%)
    /images/logo/logo.svg -- 29.00kb -> 26.61kb (8.25%)
    /images/textures/seeds/seed_red.png -- 0.46kb -> 0.43kb (7.82%)
    /images/textures/seeds/seed_orange.png -- 0.45kb -> 0.43kb (5.83%)
    /images/textures/plants/spawning/Spawning Orange Stage 3.png -- 6.70kb -> 6.34kb (5.45%)
    /images/textures/seeds/seed_cyan.png -- 0.45kb -> 0.43kb (5.42%)
    /images/textures/plants/fungal/Fungal Red Full.png -- 0.49kb -> 0.46kb (5.41%)
    /images/textures/plants/spawning/Spawning Green Stage 1.png -- 6.62kb -> 6.26kb (5.4%)
    /images/textures/plants/spawning/Spawning Red Stage 4.png -- 6.77kb -> 6.41kb (5.31%)
    /images/textures/plants/spawning/Spawning Red Stage 2.png -- 6.67kb -> 6.33kb (5.16%)
    /images/textures/plants/spawning/Spawning Green Stage 2.png -- 6.63kb -> 6.29kb (5.13%)
    /images/textures/plants/spawning/Spawning Blue Stage 4.png -- 6.80kb -> 6.46kb (5.12%)
    /images/textures/plants/spawning/Spawning Red Stage 3.png -- 6.70kb -> 6.36kb (5.1%)
    /images/textures/plants/spawning/Spawning Cyan Stage 2.png -- 6.66kb -> 6.32kb (5.09%)
    /images/textures/plants/spawning/Spawning Yellow Stage 3.png -- 6.66kb -> 6.33kb (5.08%)
    /images/textures/plants/spawning/Spawning Blue Stage 1.png -- 6.68kb -> 6.34kb (5.03%)
    /images/textures/plants/spawning/Spawning Orange Stage 4.png -- 6.72kb -> 6.38kb (4.98%)
    /images/textures/plants/spawning/Spawning Cyan Stage 1.png -- 6.64kb -> 6.31kb (4.96%)
    /images/textures/plants/spawning/Spawning Red Stage 1.png -- 6.64kb -> 6.31kb (4.93%)
    /images/textures/plants/spawning/Spawning Yellow Stage 2.png -- 6.65kb -> 6.33kb (4.89%)
    /images/textures/plants/spawning/Spawning Blue Stage 3.png -- 6.71kb -> 6.38kb (4.8%)
    /images/textures/plants/spawning/Spawning Green Stage 4.png -- 6.62kb -> 6.30kb (4.78%)
    /images/textures/plants/spawning/Spawning Green Stage 3.png -- 6.62kb -> 6.30kb (4.77%)
    /images/textures/plants/spawning/Spawning Blue Stage 2.png -- 6.68kb -> 6.37kb (4.71%)
    /images/textures/plants/spawning/Spawning Cyan Stage 4.png -- 6.66kb -> 6.35kb (4.69%)
    /images/textures/plants/spawning/Spawning Orange Stage 1.png -- 6.60kb -> 6.29kb (4.69%)
    /images/textures/plants/spawning/Spawning Yellow Stage 1.png -- 6.61kb -> 6.30kb (4.68%)
    /images/textures/plants/spawning/Spawning Cyan Stage 3.png -- 6.66kb -> 6.36kb (4.6%)
    /images/textures/plants/spawning/Spawning Yellow Stage 4.png -- 6.67kb -> 6.37kb (4.54%)
    /images/textures/plants/spawning/Spawning Orange Stage 2.png -- 6.60kb -> 6.32kb (4.29%)
    /images/textures/seeds/seed_purple.png -- 0.44kb -> 0.43kb (4.18%)
    /images/textures/plants/fungal/Fungal Purple Stage 1.png -- 5.81kb -> 5.60kb (3.58%)
    /images/textures/seeds/seed_blue.png -- 0.44kb -> 0.43kb (3.54%)
    /images/textures/plants/spawning/Spawning Purple Stage 4.png -- 6.51kb -> 6.28kb (3.5%)
    /images/textures/plants/fungal/Fungal Green Stage 1.png -- 5.77kb -> 5.57kb (3.48%)
    /images/textures/plants/fungal/Fungal Cyan Stage 2.png -- 5.82kb -> 5.62kb (3.42%)
    /images/textures/plants/fungal/Fungal Cyan Stage 4.png -- 5.84kb -> 5.64kb (3.41%)
    /images/textures/plants/fungal/Fungal Blue Stage 4.png -- 5.85kb -> 5.65kb (3.39%)
    /images/textures/plants/fungal/Fungal Orange Stage 4.png -- 5.88kb -> 5.69kb (3.29%)
    /images/textures/plants/fungal/Fungal Green Stage 2.png -- 5.78kb -> 5.59kb (3.28%)
    /images/textures/plants/fungal/Fungal Orange Stage 3.png -- 5.88kb -> 5.69kb (3.25%)
    /images/textures/plants/fungal/Fungal Blue Stage 3.png -- 5.81kb -> 5.62kb (3.24%)
    /images/textures/plants/fungal/Fungal Cyan Stage 1.png -- 5.78kb -> 5.60kb (3.19%)
    /images/textures/plants/fungal/Fungal Purple Stage 4.png -- 5.82kb -> 5.64kb (3.17%)
    /images/textures/plants/spawning/Spawning Red Full.png -- 6.57kb -> 6.37kb (3.13%)
    /images/textures/plants/fungal/Fungal Yellow Stage 4.png -- 5.84kb -> 5.66kb (3.11%)
    /images/textures/plants/fungal/Fungal Green Stage 4.png -- 5.78kb -> 5.60kb (3.11%)
    /images/textures/plants/spawning/Spawning Purple Stage 2.png -- 6.43kb -> 6.23kb (3.1%)
    /images/textures/plants/fungal/Fungal Green Stage 3.png -- 5.77kb -> 5.59kb (3.1%)
    /images/textures/plants/fungal/Fungal Yellow Stage 2.png -- 5.79kb -> 5.61kb (3.04%)
    /images/textures/plants/fungal/Fungal Purple Stage 3.png -- 5.79kb -> 5.62kb (3.03%)
    /images/textures/plants/fungal/Fungal Purple Stage 2.png -- 5.77kb -> 5.60kb (2.98%)
    /images/textures/plants/fungal/Fungal Orange Stage 1.png -- 5.80kb -> 5.63kb (2.93%)
    /images/textures/plants/spawning/Spawning Purple Stage 1.png -- 6.40kb -> 6.22kb (2.9%)
    /images/textures/plants/spawning/Spawning Purple Stage 3.png -- 6.43kb -> 6.25kb (2.84%)
    /images/textures/plants/fungal/Fungal Orange Stage 2.png -- 5.81kb -> 5.65kb (2.79%)
    /images/textures/plants/fungal/Fungal Yellow Stage 3.png -- 5.79kb -> 5.64kb (2.73%)
    /images/textures/plants/fungal/Fungal Blue Stage 2.png -- 5.76kb -> 5.61kb (2.66%)
    /images/textures/plants/fungal/Fungal Yellow Stage 1.png -- 5.76kb -> 5.61kb (2.59%)
    /images/textures/plants/fungal/Fungal Blue Stage 1.png -- 5.75kb -> 5.60kb (2.55%)
    /images/textures/plants/fungal/Fungal Cyan Stage 3.png -- 5.77kb -> 5.63kb (2.52%)
    /images/textures/plants/spawning/Spawning Green Full.png -- 6.42kb -> 6.26kb (2.42%)
    /images/textures/plants/spawning/Spawning Orange Full.png -- 6.51kb -> 6.38kb (1.99%)
    /images/textures/plants/spawning/Spawning Yellow Full.png -- 6.49kb -> 6.36kb (1.99%)
    /images/textures/plants/spawning/Spawning Cyan Full.png -- 6.45kb -> 6.34kb (1.77%)
    /images/textures/seeds/seed_green.png -- 0.43kb -> 0.43kb (1.58%)
    /images/textures/plants/spawning/Spawning Blue Full.png -- 6.54kb -> 6.45kb (1.43%)
    /images/textures/plants/fungal/Fungal Green Full.png -- 5.66kb -> 5.60kb (1.1%)
    /images/textures/plants/fungal/Fungal Yellow Full.png -- 5.69kb -> 5.63kb (0.94%)
    /images/textures/plants/fungal/Fungal Purple Full.png -- 5.63kb -> 5.58kb (0.85%)
    /images/textures/plants/fungal/Fungal Cyan Full.png -- 5.67kb -> 5.63kb (0.78%)
    /images/textures/plants/fungal/Fungal Blue Full.png -- 5.69kb -> 5.64kb (0.76%)
    /images/textures/plants/fungal/Fungal Red Stage 3.png -- 5.62kb -> 5.58kb (0.71%)
    /images/textures/plants/fungal/Fungal Red Stage 1.png -- 5.57kb -> 5.53kb (0.7%)
    /images/textures/plants/fungal/Fungal Red Stage 2.png -- 5.58kb -> 5.54kb (0.67%)
    /images/textures/plants/fungal/Fungal Orange Full.png -- 5.73kb -> 5.70kb (0.61%)
    
    Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
    ImgBotApp committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ImgBotApp Imgbot
    Copy the full SHA
    52a9143 View commit details
  3. 翻译

    ybw0014 committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    df17f38 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    3a0b6c9 View commit details
  5. 翻译

    ybw0014 committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    9c2ef0b View commit details
  6. 移除drpom

    ybw0014 committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    108b59c View commit details
  7. 翻译

    ybw0014 committed Jun 13, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    36091dd View commit details

Commits on Jun 14, 2022

  1. 翻译

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    9846e7c View commit details
  2. Merge remote-tracking branch 'upstream/master' into translation

    # Conflicts:
    #	dependency-reduced-pom.xml
    #	src/main/java/dev/sefiraat/netheopoiesis/slimefun/Stacks.java
    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    3dcf612 View commit details
  3. 完成

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    3645e37 View commit details
  4. 接入自动更新

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    d4cd932 View commit details
  5. 补充

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    c500dcc View commit details
  6. Copy the full SHA
    cbe6a00 View commit details
  7. Copy the full SHA
    5a2bea3 View commit details
  8. 修正自动更新

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    b03f379 View commit details
  9. 最终译名

    ybw0014 committed Jun 14, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    290315e View commit details
  10. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f99361e View commit details
  11. [CI skip] Merge pull request #1 from SlimefunGuguProject/imgbot

    [ImgBot] Optimize images
    ybw0014 authored Jun 14, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    57a7ac7 View commit details

Commits on Jun 16, 2022

  1. Merge remote-tracking branch 'upstream/master'

    # Conflicts:
    #	dependency-reduced-pom.xml
    #	pom.xml
    ybw0014 committed Jun 16, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    d8b77c4 View commit details
  2. [CI skip] API update

    ybw0014 committed Jun 16, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    2377708 View commit details

Commits on Jun 17, 2022

  1. Merge remote-tracking branch 'upstream/master' into merge-upstream

    # Conflicts:
    #	src/main/java/dev/sefiraat/netheopoiesis/Netheopoiesis.java
    #	src/main/java/dev/sefiraat/netheopoiesis/implementation/Groups.java
    #	src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/PurificationFlexGroup.java
    #	src/main/java/dev/sefiraat/netheopoiesis/utils/Theme.java
    ybw0014 committed Jun 17, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    7006a82 View commit details
  2. 合并上游

    ybw0014 committed Jun 17, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    903644f View commit details

Commits on Jun 18, 2022

  1. 补充汉化

    ybw0014 committed Jun 18, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    7ba55b0 View commit details
  2. 汉化

    haiman233 authored Jun 18, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b00a079 View commit details
  3. 补充汉化

    ybw0014 committed Jun 18, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    6fd9a53 View commit details
  4. 修正

    ybw0014 committed Jun 18, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    8cfcca0 View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2b42459 View commit details

Commits on Jun 19, 2022

  1. Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    a7805f9 View commit details
  2. 补充汉化

    ybw0014 committed Jun 19, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    ybw0014 ybw0014
    Copy the full SHA
    61cfd39 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    65240cc View commit details

Commits on Jul 6, 2022

  1. Merge remote-tracking branch 'upstream/master' into merge-upstream

    # Conflicts:
    #	src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java
    #	src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/Analyser.java
    ybw0014 committed Jul 6, 2022
    Copy the full SHA
    49df2db View commit details
  2. 补充汉化

    ybw0014 committed Jul 6, 2022
    Copy the full SHA
    c2bc27e View commit details
  3. 补充汉化

    ybw0014 committed Jul 6, 2022
    Copy the full SHA
    d0d008f View commit details
  4. Copy the full SHA
    c394c41 View commit details

Commits on Jul 14, 2022

  1. Copy the full SHA
    3412e4e View commit details

Commits on Jul 19, 2022

  1. Copy the full SHA
    39f6fae View commit details
  2. Copy the full SHA
    ead2ba1 View commit details

Commits on Jan 7, 2023

  1. Copy the full SHA
    354f4ab View commit details
  2. 更新前置

    ybw0014 committed Jan 7, 2023
    Copy the full SHA
    95f4ae1 View commit details

Commits on Jan 13, 2023

  1. Merge pull request #11 from Sefiraat/master

    [pull] master from Sefiraat:master
    pull[bot] authored Jan 13, 2023
    Copy the full SHA
    a1ecac6 View commit details

Commits on Feb 28, 2023

  1. Merge pull request #12 from Sefiraat/master

    [pull] master from Sefiraat:master
    pull[bot] authored Feb 28, 2023
    Copy the full SHA
    5353218 View commit details

Commits on Mar 4, 2023

  1. Merge pull request #13 from Sefiraat/master

    [pull] master from Sefiraat:master
    pull[bot] authored Mar 4, 2023
    Copy the full SHA
    7fa7e71 View commit details

Commits on Apr 5, 2023

  1. Copy the full SHA
    3f4d642 View commit details

Commits on May 20, 2023

  1. 初步更改

    ybw0014 committed May 20, 2023
    Copy the full SHA
    bc5f17c View commit details
  2. 尝试修复 #15

    ybw0014 committed May 20, 2023
    Copy the full SHA
    e9f73c8 View commit details
  3. 漏了点什么

    ybw0014 committed May 20, 2023
    Copy the full SHA
    9c846fb View commit details

Commits on Jun 6, 2023

  1. 更新依赖

    ybw0014 committed Jun 6, 2023
    Copy the full SHA
    658629d View commit details
  2. Copy the full SHA
    462f4c9 View commit details

Commits on Aug 2, 2023

  1. Copy the full SHA
    543c9ba View commit details
  2. fix: typo

    StarWishsama authored Aug 2, 2023
    Copy the full SHA
    f66878c View commit details
Showing with 1,057 additions and 928 deletions.
  1. +2 −0 .github/CODEOWNERS
  2. +0 −3 .github/FUNDING.yml
  3. +0 −34 .github/ISSUE_TEMPLATE/bug-report.md
  4. +130 −0 .github/ISSUE_TEMPLATE/bug-report.yml
  5. +5 −0 .github/ISSUE_TEMPLATE/config.yml
  6. +10 −0 .github/pull.yml
  7. +3 −4 .github/workflows/maven.yml
  8. +50 −56 README.md
  9. +1 −76 images/logo/logo.svg
  10. BIN images/logo/logo_large.png
  11. BIN images/logo/logo_small.png
  12. BIN images/logo/logo_small_icon_only.png
  13. BIN images/logo/logo_small_icon_only_inverted.png
  14. BIN images/logo/logo_white_large.png
  15. BIN images/textures/plants/fungal/Fungal Blue Full.png
  16. BIN images/textures/plants/fungal/Fungal Blue Stage 1.png
  17. BIN images/textures/plants/fungal/Fungal Blue Stage 2.png
  18. BIN images/textures/plants/fungal/Fungal Blue Stage 3.png
  19. BIN images/textures/plants/fungal/Fungal Blue Stage 4.png
  20. BIN images/textures/plants/fungal/Fungal Cyan Full.png
  21. BIN images/textures/plants/fungal/Fungal Cyan Stage 1.png
  22. BIN images/textures/plants/fungal/Fungal Cyan Stage 2.png
  23. BIN images/textures/plants/fungal/Fungal Cyan Stage 3.png
  24. BIN images/textures/plants/fungal/Fungal Cyan Stage 4.png
  25. BIN images/textures/plants/fungal/Fungal Green Full.png
  26. BIN images/textures/plants/fungal/Fungal Green Stage 1.png
  27. BIN images/textures/plants/fungal/Fungal Green Stage 2.png
  28. BIN images/textures/plants/fungal/Fungal Green Stage 3.png
  29. BIN images/textures/plants/fungal/Fungal Green Stage 4.png
  30. BIN images/textures/plants/fungal/Fungal Orange Full.png
  31. BIN images/textures/plants/fungal/Fungal Orange Stage 1.png
  32. BIN images/textures/plants/fungal/Fungal Orange Stage 2.png
  33. BIN images/textures/plants/fungal/Fungal Orange Stage 3.png
  34. BIN images/textures/plants/fungal/Fungal Orange Stage 4.png
  35. BIN images/textures/plants/fungal/Fungal Purple Full.png
  36. BIN images/textures/plants/fungal/Fungal Purple Stage 1.png
  37. BIN images/textures/plants/fungal/Fungal Purple Stage 2.png
  38. BIN images/textures/plants/fungal/Fungal Purple Stage 3.png
  39. BIN images/textures/plants/fungal/Fungal Purple Stage 4.png
  40. BIN images/textures/plants/fungal/Fungal Red Full.png
  41. BIN images/textures/plants/fungal/Fungal Red Stage 1.png
  42. BIN images/textures/plants/fungal/Fungal Red Stage 2.png
  43. BIN images/textures/plants/fungal/Fungal Red Stage 3.png
  44. BIN images/textures/plants/fungal/Fungal Yellow Full.png
  45. BIN images/textures/plants/fungal/Fungal Yellow Stage 1.png
  46. BIN images/textures/plants/fungal/Fungal Yellow Stage 2.png
  47. BIN images/textures/plants/fungal/Fungal Yellow Stage 3.png
  48. BIN images/textures/plants/fungal/Fungal Yellow Stage 4.png
  49. BIN images/textures/plants/spawning/Spawning Blue Full.png
  50. BIN images/textures/plants/spawning/Spawning Blue Stage 1.png
  51. BIN images/textures/plants/spawning/Spawning Blue Stage 2.png
  52. BIN images/textures/plants/spawning/Spawning Blue Stage 3.png
  53. BIN images/textures/plants/spawning/Spawning Blue Stage 4.png
  54. BIN images/textures/plants/spawning/Spawning Cyan Full.png
  55. BIN images/textures/plants/spawning/Spawning Cyan Stage 1.png
  56. BIN images/textures/plants/spawning/Spawning Cyan Stage 2.png
  57. BIN images/textures/plants/spawning/Spawning Cyan Stage 3.png
  58. BIN images/textures/plants/spawning/Spawning Cyan Stage 4.png
  59. BIN images/textures/plants/spawning/Spawning Green Full.png
  60. BIN images/textures/plants/spawning/Spawning Green Stage 1.png
  61. BIN images/textures/plants/spawning/Spawning Green Stage 2.png
  62. BIN images/textures/plants/spawning/Spawning Green Stage 3.png
  63. BIN images/textures/plants/spawning/Spawning Green Stage 4.png
  64. BIN images/textures/plants/spawning/Spawning Orange Full.png
  65. BIN images/textures/plants/spawning/Spawning Orange Stage 1.png
  66. BIN images/textures/plants/spawning/Spawning Orange Stage 2.png
  67. BIN images/textures/plants/spawning/Spawning Orange Stage 3.png
  68. BIN images/textures/plants/spawning/Spawning Orange Stage 4.png
  69. BIN images/textures/plants/spawning/Spawning Purple Full.png
  70. BIN images/textures/plants/spawning/Spawning Purple Stage 1.png
  71. BIN images/textures/plants/spawning/Spawning Purple Stage 2.png
  72. BIN images/textures/plants/spawning/Spawning Purple Stage 3.png
  73. BIN images/textures/plants/spawning/Spawning Purple Stage 4.png
  74. BIN images/textures/plants/spawning/Spawning Red Full.png
  75. BIN images/textures/plants/spawning/Spawning Red Stage 1.png
  76. BIN images/textures/plants/spawning/Spawning Red Stage 2.png
  77. BIN images/textures/plants/spawning/Spawning Red Stage 3.png
  78. BIN images/textures/plants/spawning/Spawning Red Stage 4.png
  79. BIN images/textures/plants/spawning/Spawning Yellow Full.png
  80. BIN images/textures/plants/spawning/Spawning Yellow Stage 1.png
  81. BIN images/textures/plants/spawning/Spawning Yellow Stage 2.png
  82. BIN images/textures/plants/spawning/Spawning Yellow Stage 3.png
  83. BIN images/textures/plants/spawning/Spawning Yellow Stage 4.png
  84. BIN images/textures/plants/spikey/Spikey Blue Full.png
  85. BIN images/textures/plants/spikey/Spikey Blue Stage 1.png
  86. BIN images/textures/plants/spikey/Spikey Blue Stage 2.png
  87. BIN images/textures/plants/spikey/Spikey Blue Stage 3.png
  88. BIN images/textures/plants/spikey/Spikey Blue Stage 4.png
  89. BIN images/textures/plants/spikey/Spikey Cyan Full.png
  90. BIN images/textures/plants/spikey/Spikey Cyan Stage 1.png
  91. BIN images/textures/plants/spikey/Spikey Cyan Stage 2.png
  92. BIN images/textures/plants/spikey/Spikey Cyan Stage 3.png
  93. BIN images/textures/plants/spikey/Spikey Cyan Stage 4.png
  94. BIN images/textures/plants/spikey/Spikey Green Full.png
  95. BIN images/textures/plants/spikey/Spikey Green Stage 1.png
  96. BIN images/textures/plants/spikey/Spikey Green Stage 2.png
  97. BIN images/textures/plants/spikey/Spikey Green Stage 3.png
  98. BIN images/textures/plants/spikey/Spikey Green Stage 4.png
  99. BIN images/textures/plants/spikey/Spikey Orange Full.png
  100. BIN images/textures/plants/spikey/Spikey Orange Stage 1.png
  101. BIN images/textures/plants/spikey/Spikey Orange Stage 2.png
  102. BIN images/textures/plants/spikey/Spikey Orange Stage 3.png
  103. BIN images/textures/plants/spikey/Spikey Orange Stage 4.png
  104. BIN images/textures/plants/spikey/Spikey Purple Full.png
  105. BIN images/textures/plants/spikey/Spikey Purple Stage 1.png
  106. BIN images/textures/plants/spikey/Spikey Purple Stage 2.png
  107. BIN images/textures/plants/spikey/Spikey Purple Stage 3.png
  108. BIN images/textures/plants/spikey/Spikey Purple Stage 4.png
  109. BIN images/textures/plants/spikey/Spikey Red Full.png
  110. BIN images/textures/plants/spikey/Spikey Red Stage 1.png
  111. BIN images/textures/plants/spikey/Spikey Red Stage 2.png
  112. BIN images/textures/plants/spikey/Spikey Red Stage 3.png
  113. BIN images/textures/plants/spikey/Spikey Red Stage 4.png
  114. BIN images/textures/plants/spikey/Spikey Yellow Full.png
  115. BIN images/textures/plants/spikey/Spikey Yellow Stage 1.png
  116. BIN images/textures/plants/spikey/Spikey Yellow Stage 2.png
  117. BIN images/textures/plants/spikey/Spikey Yellow Stage 3.png
  118. BIN images/textures/plants/spikey/Spikey Yellow Stage 4.png
  119. BIN images/textures/plants/viney/Viney Blue Full.png
  120. BIN images/textures/plants/viney/Viney Blue Stage 1.png
  121. BIN images/textures/plants/viney/Viney Blue Stage 2.png
  122. BIN images/textures/plants/viney/Viney Blue Stage 3.png
  123. BIN images/textures/plants/viney/Viney Blue Stage 4.png
  124. BIN images/textures/plants/viney/Viney Cyan Full.png
  125. BIN images/textures/plants/viney/Viney Cyan Stage 1.png
  126. BIN images/textures/plants/viney/Viney Cyan Stage 2.png
  127. BIN images/textures/plants/viney/Viney Cyan Stage 3.png
  128. BIN images/textures/plants/viney/Viney Cyan Stage 4.png
  129. BIN images/textures/plants/viney/Viney Green Full.png
  130. BIN images/textures/plants/viney/Viney Green Stage 1.png
  131. BIN images/textures/plants/viney/Viney Green Stage 2.png
  132. BIN images/textures/plants/viney/Viney Green Stage 3.png
  133. BIN images/textures/plants/viney/Viney Green Stage 4.png
  134. BIN images/textures/plants/viney/Viney Orange Full.png
  135. BIN images/textures/plants/viney/Viney Orange Stage 1.png
  136. BIN images/textures/plants/viney/Viney Orange Stage 2.png
  137. BIN images/textures/plants/viney/Viney Orange Stage 3.png
  138. BIN images/textures/plants/viney/Viney Orange Stage 4.png
  139. BIN images/textures/plants/viney/Viney Purple Full.png
  140. BIN images/textures/plants/viney/Viney Purple Stage 1.png
  141. BIN images/textures/plants/viney/Viney Purple Stage 2.png
  142. BIN images/textures/plants/viney/Viney Purple Stage 3.png
  143. BIN images/textures/plants/viney/Viney Purple Stage 4.png
  144. BIN images/textures/plants/viney/Viney Red Full.png
  145. BIN images/textures/plants/viney/Viney Red Stage 1.png
  146. BIN images/textures/plants/viney/Viney Red Stage 2.png
  147. BIN images/textures/plants/viney/Viney Red Stage 3.png
  148. BIN images/textures/plants/viney/Viney Red Stage 4.png
  149. BIN images/textures/plants/viney/Viney Yellow Full.png
  150. BIN images/textures/plants/viney/Viney Yellow Stage 1.png
  151. BIN images/textures/plants/viney/Viney Yellow Stage 2.png
  152. BIN images/textures/plants/viney/Viney Yellow Stage 3.png
  153. BIN images/textures/plants/viney/Viney Yellow Stage 4.png
  154. BIN images/textures/seeds/seed_blue.png
  155. BIN images/textures/seeds/seed_cyan.png
  156. BIN images/textures/seeds/seed_green.png
  157. BIN images/textures/seeds/seed_orange.png
  158. BIN images/textures/seeds/seed_purple.png
  159. BIN images/textures/seeds/seed_red.png
  160. +11 −26 pom.xml
  161. +9 −9 src/main/java/dev/sefiraat/netheopoiesis/Netheopoiesis.java
  162. +2 −2 src/main/java/dev/sefiraat/netheopoiesis/Purification.java
  163. +34 −36 src/main/java/dev/sefiraat/netheopoiesis/api/RecipeTypes.java
  164. +9 −9 src/main/java/dev/sefiraat/netheopoiesis/api/interfaces/NetherPlant.java
  165. +3 −3 src/main/java/dev/sefiraat/netheopoiesis/api/interfaces/SpreadingPlant.java
  166. +19 −10 src/main/java/dev/sefiraat/netheopoiesis/api/items/BeaconSiphoningBlock.java
  167. +3 −2 src/main/java/dev/sefiraat/netheopoiesis/api/items/BiomeSpreadingSeed.java
  168. +7 −6 src/main/java/dev/sefiraat/netheopoiesis/api/items/CruxSpreadingSeed.java
  169. +9 −8 src/main/java/dev/sefiraat/netheopoiesis/api/items/DroppingSeed.java
  170. +2 −1 src/main/java/dev/sefiraat/netheopoiesis/api/items/EntitySpawningSeed.java
  171. +2 −1 src/main/java/dev/sefiraat/netheopoiesis/api/items/GenericTickingSeed.java
  172. +4 −4 src/main/java/dev/sefiraat/netheopoiesis/api/items/NetherCrux.java
  173. +39 −29 src/main/java/dev/sefiraat/netheopoiesis/api/items/NetherSeed.java
  174. +6 −6 src/main/java/dev/sefiraat/netheopoiesis/api/plant/netheos/NetheoBalls.java
  175. +1 −1 src/main/java/dev/sefiraat/netheopoiesis/api/plant/netheos/Trade.java
  176. +9 −9 src/main/java/dev/sefiraat/netheopoiesis/implementation/GenericTickingMethods.java
  177. +10 −10 src/main/java/dev/sefiraat/netheopoiesis/implementation/Groups.java
  178. +389 −408 src/main/java/dev/sefiraat/netheopoiesis/implementation/Stacks.java
  179. +4 −4 src/main/java/dev/sefiraat/netheopoiesis/implementation/blocks/NetherBeacon.java
  180. +6 −6 src/main/java/dev/sefiraat/netheopoiesis/implementation/commands/NetheoCommands.java
  181. +10 −9 src/main/java/dev/sefiraat/netheopoiesis/implementation/flora/CrystallineCrux.java
  182. +9 −7 src/main/java/dev/sefiraat/netheopoiesis/implementation/flora/PurificationSeed.java
  183. +24 −13 src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/DiscoveriesFlexGroup.java
  184. +8 −2 src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/MainFlexGroup.java
  185. +76 −71 src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/PurificationFlexGroup.java
  186. +21 −11 src/main/java/dev/sefiraat/netheopoiesis/implementation/groups/TradesFlexGroup.java
  187. +1 −1 src/main/java/dev/sefiraat/netheopoiesis/implementation/tasks/MobSpawnTask.java
  188. +11 −7 src/main/java/dev/sefiraat/netheopoiesis/implementation/tasks/UpdateCruxTask.java
  189. +10 −9 src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/Analyser.java
  190. +2 −1 src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/HarvestingTool.java
  191. +2 −2 src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/MixingQuartz.java
  192. +2 −2 src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/PurificationBarometer.java
  193. +4 −3 src/main/java/dev/sefiraat/netheopoiesis/implementation/tools/PurificationScanner.java
  194. +2 −1 src/main/java/dev/sefiraat/netheopoiesis/listeners/BlockProtectionListener.java
  195. +2 −1 src/main/java/dev/sefiraat/netheopoiesis/listeners/CrystallineSeedListener.java
  196. +12 −3 src/main/java/dev/sefiraat/netheopoiesis/listeners/MobSpawnListener.java
  197. +2 −2 src/main/java/dev/sefiraat/netheopoiesis/listeners/PlayerSleepListener.java
  198. +1 −1 src/main/java/dev/sefiraat/netheopoiesis/managers/ConfigManager.java
  199. +2 −2 src/main/java/dev/sefiraat/netheopoiesis/utils/Skulls.java
  200. +17 −17 src/main/java/dev/sefiraat/netheopoiesis/utils/Theme.java
  201. +55 −0 src/main/java/net/guizhanss/netheopoiesis/utils/NetheoBallUtils.java
  202. +4 −0 src/main/resources/config.yml
  203. +1 −0 src/main/resources/plugin.yml
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
This CODEOWNERS file contains errors

CODEOWNERS errors

  • Unknown owner on line 1: make sure the team @SlimefunGuguProject/code-reviewers exists, is publicly visible, and has write access to the repository
    *.java             @SlimefunGuguProject/code-reviewers
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.java @SlimefunGuguProject/code-reviewers
@ybw0014
3 changes: 0 additions & 3 deletions .github/FUNDING.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

130 changes: 130 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: Bug汇报
description: 反馈本插件的Bug或问题
labels: ["bug"]
assignees:
- ybw0014
body:
- type: markdown
attributes:
value: |
## 欢迎来到 SlimefunGuguProject 的问题追踪器
你正在反馈 Netheopoiesis 汉化版出现的 Bug。
任何意见,建议请前往[QQ群](https://ybw0014.net/go/sf-qgroup)进行反馈。
建议先阅读[这篇文章](https://slimefun-wiki.guizhanss.cn/How-to-report-bugs)了解如何正确地汇报Bug。
<strong><i>你必须填写标注为星号(*)的表单项</i></strong>
- type: checkboxes
id: checklist
attributes:
label: 检查项目
description: 在汇报之前,你需要确认
options:
- label: 你使用的是从构建站下载的版本
required: true
- label: 你已经检验过下载的文件的校验和,确认已完整下载文件
required: false
- label: 你没有对下载的文件内容进行任何更改
required: true
- label: 你已经寻找过[已知问题列表](https://github.com/SlimefunGuguProject/Netheopoiesis/issues),且没有找到相同的问题
required: true

- type: textarea
id: description
attributes:
label: 问题描述
description: |
详细描述你要汇报的问题
提供详细的信息能让我们更快地处理问题
placeholder: 只说"不能用"没法让开发者定位问题。
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: 复现步骤
description: |
请详细描述如何才能复现该问题
如果有视频,请在此提供视频链接
placeholder: |
1. xxx
2. xxx
validations:
required: true

- type: textarea
id: expected-behavior
attributes:
label: 预期行为
description: |
你觉得应该发生什么
有时候,问题的原因是你误解了某个功能。
validations:
required: true

- type: input
id: server-log
attributes:
label: 服务器日志
description: |
请查看服务器日志中是否包含任何报错,如果有请上传至 [https://paste.guizhanss.net/](https://paste.guizhanss.net/) 并在此填入链接。
**不要直接在这里粘贴日志**
placeholder: https://paste.guizhanss.net/...
validations:
required: false

- type: input
id: error-report
attributes:
label: 错误报告
description: |
如果服务器日志中提到了`/plugins/Slimefun/error-reports`中的文件(即错误报告)
请上传至 [https://paste.guizhanss.net/](https://paste.guizhanss.net/) 并在此填入链接。
**不要直接在这里粘贴错误报告**
placeholder: https://paste.guizhanss.net/...
validations:
required: false

- type: dropdown
id: server-software
attributes:
label: 服务端软件
description: 请选择你服务端所使用的软件
options:
- Spigot
- Paper
- Purpur
- Airplane
- 其他 (请在问题描述里写明)
validations:
required: true

- type: input
id: minecraft-version
attributes:
label: Minecraft 版本
description: 请填写你的 Minecraft 版本
validations:
required: true

- type: textarea
id: slimefun-version
attributes:
label: Slimefun版本
description: |
请填写Slimefun版本
(例如 v4.9-canary-08120db)
如果你有管理员权限,建议运行`/sf versions`指令,截图并在此上传指令输出的**所有内容**。
validations:
required: true

- type: input
id: version-plugin
attributes:
label: 插件版本
description: |
请填写插件版本
(例如 Build 1 (git x114514))
validations:
required: true
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 没有 Github 账号? 不会使用 Github?
url: https://ybw0014.net/go/sf-qgroup
about: 点击右侧按钮加入QQ群进行反馈
10 changes: 10 additions & 0 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: "1"
rules:
- base: master
upstream: Sefiraat:master
mergeMethod: merge
assignees:
- ybw0014
conflictReviewers:
- ybw0014

7 changes: 3 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -11,16 +11,15 @@ on:

jobs:
build:

if: startsWith(github.event.head_commit.message, '[CI skip]') == false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.3
- name: Set up JDK 16
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 16
cache: 'maven'
- name: Build with Maven
run: mvn package --file pom.xml
run: mvn package --file pom.xml
106 changes: 50 additions & 56 deletions README.md
Original file line number Diff line number Diff line change
@@ -2,80 +2,74 @@
<img width="800" src="https://github.com/Sefiraat/Netheopoiesis/blob/master/images/logo/logo.svg"><br><br>
</p>

# Netheopoiesis
# Netheopoiesis - 下界乌托邦

Netheopoiesis is our entry to the Slimefun Addon Jam 2022. Created by Sefiraat and J3fftw
Netheopoiesis Slimefun Addon Jam 2022 的参赛作品,由 Sefiraat J3fftw 开发。

This addon has three main aims:
这个附属插件有三个主要目标:

- To bring life to the Nether, as per the Addon Jam's theme.
- To create the potential for players to be able to play both Vanilla Minecraft and Slimefun solely in the nether,
should they choose to
- To make the nether a place suitable (and safe!) place to call home
- 正如本届 Addon Jam 的主题,为下界带去生机。
- 为同时玩原版和 Slimefun 的玩家提供在下界永居的机会。
- 让下界变成一个更舒适 (也更安全!), 甚至可以称之为家的地方。

A more detailed description of mechanics and details on plants can be found in my documentation
wiki [here](https://docs.sefiraat.dev/netheopoiesis/purification)
关于机制和植物的详细介绍可以在[中文Wiki](https://slimefun-addons-wiki.guizhanss.cn/netheopoiesis/)中找到。

## Purification
## 下载

The primary mechanic of this addon is the Purification system. When you place/grow certain items from this addon in the
nether, they will begin to lift the veil of darkness over the Nether in the surrounding area. This is the '
Purification Value'. Not only will the value increase but the blocks will change. These blocks become progressively more
lush as you progress.
<p align="center">
<a href="https://builds.guizhanss.com/SlimefunGuguProject/Netheopoiesis/master">
<img src="https://builds.guizhanss.com/f/SlimefunGuguProject/Netheopoiesis/master/badge.svg" alt="Build status"/>
</a>
</p>

## 净化

Netheopoiesis 的首要机制就是净化系统。当你在下界中放置或是种植附属中特定的物品,它们将开始逐渐揭开四周的下界黑暗面纱。
这就是 '净化值'。除去净化值的提升以外,区块也会发生变化。这些区块会随着你的发展变得更加丰富。

As a chunk's purification value increases, you will be rewarded with things that are not normally possible in the
Nether:
随着一个区块的净化值提升, 你会逐渐能在下界做原先不能做的事了:

- Being able to sleep in a bed!
- Being able to place water and grow new crops.
- Nether Mob spawns will slowly be replaced with overworld mobs, respecting the Nether's day/light cycle.
- Other Spawns will appear as the purification level gets higher including fish, random passive mobs and even wandering
traders!
- Specific mobs will become friendly while in purified ground
- Bartering reaps greater rewards the higher the purification value
- Travel to the end using the Ender Cake
- Passive healing while in a purified region, increasing with the level of purification
- In the latter stages, you are able to go beyond just purification being able to:
- Create overworld biomes in the Nether
- Convert massive lava lakes into water
- 在床上睡觉!
- 能够放置水并种植作物。
- 下界生成的怪物将会被逐渐替换成主世界的怪物,取决于下界的日夜更替周期。
- 随着净化值的提升,其他生物也会生成,包括鱼,动物,甚至流浪商人!
- 在净化过的区域中,特定的生物将会对你友好而不会攻击你。
- 净化值越高,以物换物获得的奖励就会越高。
- 通过末影蛋糕前往末地。
- 在净化区的被动治疗,治疗效果取决于净化值。
- 在后期,你能够做除净化以外的事情:
- 在下界创建主世界的生物群系
- 将岩浆湖中的岩浆变为水

And more...
还有更多...

Purification begins by finding a Purification Seed. This seed will kick-start your journey in the nether as, when
placed, it will slowly begin to purify the surrounding blocks from Netherrack into Basic Purified Netherrack. Overtime
you will learn how to purify the Netherrack further into more rich soil types, each with an increasing effect on the
nearby purification value, leading us neatly into our second main mechanic...
净化始于净化之种。这颗种子将开始你在下界的旅程,种下后,它会开始缓慢净化附近的方块。将附近的下界岩净化为基本净化的下界岩。
随着进一步的探索,你将学会如何将下界岩净化为更加肥沃的土壤类型,每一种都对附近的净化值有所提升,接下来将介绍我们的第二个主要机制。

## Seeds
## 种子

The secondary mechanic is a vast plant growing/breeding system. Starting with 2 purification seeds next to one another (
with an air block between them) you can begin to breed cloned seeds and mutate new variants. These new variants each do
something unique from dropping materials, being harvestable for additional items, spawning mobs, pulsing beacon/potion
effects, growing trees and more.
第二个机制则是一个庞大的种植/繁殖系统。从两个相邻的净化之种开始 (中间相隔一格),你就可以开始培育克隆种子,并通过育种得到新的变种。
这些新的变种都各自有不同的特性,包括得到材料,收获额外的物品,生成生物,提供信标/药水效果,种植出树木等等。

As a bonus each seed will also add to the nearby purification value, with more complex-bred seeds providing more.
作为奖励,种植的种子也会提升附近的净化值,更复杂的种子也会提供更高的净化值。

An in-depth breeding dictionary is available to keep track of discovered breeds and more detailed information about a
seed not initially available in the regular portion of the guide. Breeding requirements are hidden until the first time
you discover one, so watch out for in-game feedback, for example black particles mean the plants cannot breed, so you
best stop trying!
详细的育种指南可用于追踪已发现的品种和提供关于一个种子的详细信息,但这些信息最初在指南的常规部分是不存在的,育种要求在你未发现时也是隐藏的,
所以要注意游戏内的交互效果。例如,黑色粒子效果意味着该植物无法繁殖,所以你最好别再试了!

With a whopping 65 seeds currently available you'll have to do a lot of experimentation!
目前已提供了高达 65 个不同类型的种子,你得做好多次实验才能得到它们!

*Hint: Breeding a purifying seed with another of the same type is a good way to discover new seeds each time you find a
new one*
*提示:当你发现一种新种子时,将一个净化之种与同类型的种子杂交,是发现新种子的一个好方法*

## Future Development
## 未来开发的方向

We had a lot of ideas for what we wanted to do here, but needed to keep the scope reasonable to ensure a completed
product would be ready for the end of the Jam, so here are a list of our planned features after the results of the Jam:
我们有很多新玩法的点子,但我们需要确保在合理的范围内实现,以在 Addon Jam 结束前完成提供一个完整版本,
以下是在 Addon Jam 结果出来以后计划的新功能列表:

- A plant or other generation method for every overworld-only item
- Legitimate sky access in the most purified areas
- 为每个仅在主世界才有的物品提供方法获得 (比如植物)
- 在纯净值最高的区域能看见天空

## Credits
## 鸣谢

Big thank goes to GentlemanCheesy#2225 who made both the Viney and Spiney texture sets used for some plants within this
addon. He made them in a very short time frame and, for those who may not know, each color and each shade as they grow
had to be their own texture!
Even the Spawning heads made by me in this addon used his as a base so massive kudos to him :)
非常感谢 GentlemanCheesy#2225 制作了附属中部分植物的材质。他在短时间内就完成了制作,
对于那些不了解的人来说,在生长过程中的每种颜色和每种阴影都必须有单独的材质!
甚至刷怪植物的头颅材质也使用了他的材质作为基础,所以要向他致以崇高的敬意 :)
Loading