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: KakarottoCake/BiomesOPlenty
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: BOP-public
Choose a base ref
...
head repository: Glitchfiend/BiomesOPlenty
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: BOP-public
Choose a head ref
Able to merge. These branches can be automatically merged.
9 contributors

Commits on Aug 2, 2021

  1. Update ko_kr.json (Glitchfiend#1888)

    @mindy15963
    mindy15963 authored Aug 2, 2021
    Copy the full SHA
    316b030 View commit details

Commits on Aug 16, 2021

  1. Update ko_kr.json (Glitchfiend#1893)

    @mindy15963
    mindy15963 authored Aug 16, 2021
    Copy the full SHA
    d54666a View commit details

Commits on Aug 18, 2021

  1. Added Blood liquid and Porous Flesh blocks to the Visceral Heap. NOTE… 

    …: The Blood fluid is not 100% finished and will have minor issues.
    @Forstride @Adubbz
    Forstride authored and Adubbz committed Aug 18, 2021
    Copy the full SHA
    3f2d6ac View commit details

  2. git subrepo pull public 

    subrepo:
  subdir:   "public"
  merged:   "c900619c"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "c900619c"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
    @Adubbz
    Adubbz committed Aug 18, 2021
    Copy the full SHA
    0bfe3c1 View commit details

  3. Added Flesh Tendon Strands to the Visceral Heap

    @Forstride @Adubbz
    Forstride authored and Adubbz committed Aug 18, 2021
    Copy the full SHA
    ee7bceb View commit details

  4. Added Blackstone Spines and Blackstone Bulbs to the Withered Abyss

    @Forstride @Adubbz
    Forstride authored and Adubbz committed Aug 18, 2021
    Copy the full SHA
    6e16e04 View commit details

  5. Added blood drip particles, tweaked flesh tendon generation

    @Forstride @Adubbz
    Forstride authored and Adubbz committed Aug 18, 2021
    Copy the full SHA
    bcdb27f View commit details

  6. Added Hair and Pus Bubbles to the Visceral Heap

    @Forstride @Adubbz
    Forstride authored and Adubbz committed Aug 18, 2021
    Copy the full SHA
    3f7663c View commit details

  7. Merge commit 'refs/subrepo/public/fetch' into subrepo/public

    @Adubbz
    Adubbz committed Aug 18, 2021
    Copy the full SHA
    1ae9e68 View commit details

  8. Fix merge conflicts with ko translation

    @Adubbz
    Adubbz committed Aug 18, 2021
    Copy the full SHA
    3ebc6be View commit details

Commits on Dec 28, 2021

  1. Updated for 1.18

    @Adubbz
    Adubbz committed Dec 28, 2021
    Copy the full SHA
    68ece12 View commit details

  2. Revise issue templates

    @Adubbz
    Adubbz committed Dec 28, 2021
    Copy the full SHA
    e5832ca View commit details

  3. Minor issue template revisions

    @Adubbz
    Adubbz committed Dec 28, 2021
    Copy the full SHA
    3433138 View commit details

  4. Make x chars consistent

    @Adubbz
    Adubbz committed Dec 28, 2021
    Copy the full SHA
    59ce779 View commit details

Commits on Dec 29, 2021

  1. Updated issue templates

    @Adubbz
    Adubbz committed Dec 29, 2021
    Copy the full SHA
    8455baa View commit details

Commits on Dec 30, 2021

  1. Update ko_kr.json (Glitchfiend#1931)

    @mindy15963
    mindy15963 authored Dec 30, 2021
    Copy the full SHA
    50ec0fd View commit details

  2. Update for latest build

    @Adubbz
    Adubbz committed Dec 30, 2021
    Copy the full SHA
    22dd90c View commit details

  3. Update Spanish translations (Glitchfiend#1934) 

    * Update es_ar.json
* Update es_es.json
* Update es_mx.json
    @felinux02
    felinux02 authored Dec 30, 2021
    Copy the full SHA
    9eb127f View commit details

Commits on Jan 2, 2022

  1. Update ko_kr.json (Glitchfiend#1935)

    @mindy15963
    mindy15963 authored Jan 2, 2022
    Copy the full SHA
    424ce54 View commit details

Commits on Jan 3, 2022

  1. Update pt_br.json (Glitchfiend#1941)

    @ppblitto
    ppblitto authored Jan 3, 2022
    Copy the full SHA
    a1dbccb View commit details

Commits on Jan 4, 2022

  1. Update Spanish translations (Glitchfiend#1943) 

    * Update es_ar.json
* Update es_es.json
* Update es_mx.json
    @felinux02
    felinux02 authored Jan 4, 2022
    Copy the full SHA
    b4bee83 View commit details

Commits on Jan 8, 2022

  1. Updated for the latest build

    @Adubbz
    Adubbz committed Jan 8, 2022
    Copy the full SHA
    8480f1c View commit details

Commits on Jan 13, 2022

  1. Update ru_ru.json (Glitchfiend#1950)

    @Altegar
    Altegar authored Jan 13, 2022
    Copy the full SHA
    f4ec34c View commit details

Commits on Jan 14, 2022

  1. Update uk_ua.json (Glitchfiend#1952)

    @Altegar
    Altegar authored Jan 14, 2022
    Copy the full SHA
    114f223 View commit details

Commits on Jan 20, 2022

  1. Update ru_ru.json (Glitchfiend#1957)

    @Altegar
    Altegar authored Jan 20, 2022
    Copy the full SHA
    f954169 View commit details

  2. Update uk_ua.json (Glitchfiend#1958)

    @Altegar
    Altegar authored Jan 20, 2022
    Copy the full SHA
    d382a09 View commit details

Commits on Jan 21, 2022

  1. Update ko_kr.json (Glitchfiend#1959)

    @mindy15963
    mindy15963 authored Jan 21, 2022
    Copy the full SHA
    76300e2 View commit details

  2. Update en_us.json (Glitchfiend#1956)

    @Altegar
    Altegar authored Jan 21, 2022
    Copy the full SHA
    e02df47 View commit details

Commits on Jan 23, 2022

  1. Create kk_kz.json (Glitchfiend#1962)

    @AlibekAytjan
    AlibekAytjan authored Jan 23, 2022
    Copy the full SHA
    d05eebb View commit details

  2. Update Spanish translations (Glitchfiend#1960)

    @felinux02
    felinux02 authored Jan 23, 2022
    Copy the full SHA
    d7f04a2 View commit details

  3. Fixed localized name for BOP boat entity (Glitchfiend#1963)

    @Altegar
    Altegar authored Jan 23, 2022
    Copy the full SHA
    4982c8c View commit details

  4. Update ru_ru.json (Glitchfiend#1964) 

    Fixed localized name for BOP boat entity
    @Altegar
    Altegar authored Jan 23, 2022
    Copy the full SHA
    4af065a View commit details

  5. Update uk_ua.json (Glitchfiend#1965) 

    Fixed localized name for BOP boat entity
    @Altegar
    Altegar authored Jan 23, 2022
    Copy the full SHA
    776bca8 View commit details

Commits on Mar 29, 2022

  1. Updated the issue templates

    @Adubbz
    Adubbz committed Mar 29, 2022
    Copy the full SHA
    040b153 View commit details

Commits on Apr 19, 2022

  1. update de_de.json (Glitchfiend#1966) 

    added missing lines & removed old stuff, improved translation here and there. Exactly matching en_us now.

BR
    @Wizqok
    Wizqok authored Apr 19, 2022
    Copy the full SHA
    8a26bdd View commit details

  2. Update pt_br.json (Glitchfiend#1969)

    @ppblitto
    ppblitto authored Apr 19, 2022
    Copy the full SHA
    c932fbc View commit details

  3. Update kk_kz.json (Glitchfiend#1976)

    @AlibekAytjan
    AlibekAytjan authored Apr 19, 2022
    Copy the full SHA
    879a108 View commit details

  4. Update kk_kz.json (Glitchfiend#1968)

    @AlibekAytjan
    AlibekAytjan authored Apr 19, 2022
    Copy the full SHA
    ab725c1 View commit details

Commits on Jun 9, 2022

  1. Updated for Minecraft 1.19

    @Adubbz
    Adubbz committed Jun 9, 2022
    Copy the full SHA
    9b8008c View commit details

Commits on Aug 3, 2022

  1. Create vi_vn.json (Glitchfiend#2041)

    @gousisme
    gousisme authored Aug 3, 2022
    Copy the full SHA
    186c872 View commit details
Showing with 2,539 additions and 1,541 deletions.
  1. +46 −0 .github/ISSUE_TEMPLATE/1-bug_report.yml
  2. +0 −27 .github/ISSUE_TEMPLATE/1-standalone-bug.md
  3. +48 −0 .github/ISSUE_TEMPLATE/2-crash_report.yml
  4. +0 −23 .github/ISSUE_TEMPLATE/2-standalone-crash.md
  5. +0 −20 .github/ISSUE_TEMPLATE/3-feature-request.md
  6. +28 −0 .github/ISSUE_TEMPLATE/3-feature_request.yml
  7. +91 −85 src/main/java/biomesoplenty/api/biome/BOPBiomes.java
  8. +13 −0 src/main/java/biomesoplenty/api/block/BOPBlockEntities.java
  9. +331 −328 src/main/java/biomesoplenty/api/block/BOPBlocks.java
  10. +10 −0 src/main/java/biomesoplenty/api/block/BOPFluids.java
  11. +25 −0 src/main/java/biomesoplenty/api/block/BOPWoodTypes.java
  12. +14 −0 src/main/java/biomesoplenty/api/entity/BOPEntities.java
  13. +0 −208 src/main/java/biomesoplenty/api/enums/BOPClimates.java
  14. +39 −16 src/main/java/biomesoplenty/api/item/BOPItems.java
  15. +0 −10 src/main/java/biomesoplenty/api/particle/BOPParticleTypes.java
  16. +8 −6 src/main/java/biomesoplenty/api/sound/BOPSounds.java
  17. +65 −49 src/main/resources/assets/biomesoplenty/lang/de_de.json
  18. +43 −49 src/main/resources/assets/biomesoplenty/lang/en_us.json
  19. +31 −42 src/main/resources/assets/biomesoplenty/lang/es_ar.json
  20. +30 −42 src/main/resources/assets/biomesoplenty/lang/es_es.json
  21. +30 −42 src/main/resources/assets/biomesoplenty/lang/es_mx.json
  22. +432 −0 src/main/resources/assets/biomesoplenty/lang/kk_kz.json
  23. +33 −43 src/main/resources/assets/biomesoplenty/lang/ko_kr.json
  24. +226 −95 src/main/resources/assets/biomesoplenty/lang/pt_br.json
  25. +68 −52 src/main/resources/assets/biomesoplenty/lang/ru_ru.json
  26. +249 −233 src/main/resources/assets/biomesoplenty/lang/uk_ua.json
  27. +437 −0 src/main/resources/assets/biomesoplenty/lang/vi_vn.json
  28. +242 −171 src/main/resources/assets/biomesoplenty/lang/zh_tw.json
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug_report.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: 1.19+ Bug Report
description: File a bug report
labels: [bug]
body:
- type: markdown
attributes:
value: |
For bugs experienced with Minecraft 1.19+. Older versions are not supported.
If any section does not apply, replace its content with "N/A".
Please search for existing bug reports before making your own report.
Duplicate reports will be marked as such and you will be referred to the original report.
- type: textarea
attributes:
label: What's the issue you encountered?
description: |
Describe the issue in detail and what you were doing beforehand.
validations:
required: true
- type: textarea
attributes:
label: How can the issue be reproduced?
description: Include a detailed step by step process for recreating your issue.
validations:
required: true
- type: input
attributes:
label: Logs
description: |
Logs can be found in your Minecraft directory under `/logs/latest.log`.
If your issue caused Minecraft to crash, include the crash report by creating a [gist](https://gist.github.com/) and pasting the link here.
If your don't include logs in instances of crash related issues, we will ask you to provide one.
- type: input
attributes:
label: Mod Version
description: |
Replace ×'s with the mod version you are using.
You can find your mod version by checking the ``Mods`` menu on the title screen.
placeholder: ×.×.×.×
validations:
required: true
- type: textarea
attributes:
label: Additional information
description: |
Any other information relevant to your issue.
27 changes: 0 additions & 27 deletions .github/ISSUE_TEMPLATE/1-standalone-bug.md
View file

This file was deleted.

48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/2-crash_report.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: 1.19+ Crash Report
description: File a crash report
labels: [crash]
body:
- type: markdown
attributes:
value: |
For crashes experienced with Minecraft 1.19+. Older versions are not supported.
If any section does not apply, replace its content with "N/A".
Please search for existing crash reports before making your own report.
Duplicate reports will be marked as such and you will be referred to the original report.
- type: textarea
attributes:
label: What's the issue you encountered?
description: |
Describe the issue in detail and what you were doing beforehand.
validations:
required: true
- type: textarea
attributes:
label: How can the issue be reproduced?
description: Include a detailed step by step process for recreating your issue.
validations:
required: true
- type: input
attributes:
label: Logs
description: |
Logs can be found in your Minecraft directory under `/logs/latest.log`.
If your issue caused Minecraft to crash, include the crash report by creating a [gist](https://gist.github.com/) and pasting the link here.
If your don't include logs in instances of crash related issues, we will ask you to provide one.
validations:
required: true
- type: input
attributes:
label: Mod Version
description: |
Replace ×'s with the mod version you are using.
You can find your mod version by checking the ``Mods`` menu on the title screen.
placeholder: ×.×.×.×
validations:
required: true
- type: textarea
attributes:
label: Additional information
description: |
Any other information relevant to your issue.
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/2-standalone-crash.md
View file

This file was deleted.

20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/3-feature-request.md
View file

This file was deleted.

28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/3-feature_request.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: 1.19+ Feature Request
description: Request a new feature
labels: [feature]
body:
- type: markdown
attributes:
value: |
Feature requests for Minecraft 1.19+. Older versions are not supported.
If any section does not apply, replace its contents with "N/A".
Please search for existing feature requests before you make your own request.
Duplicate requests will be marked as such and you will be referred to the original request.
- type: markdown
attributes:
value: "## What feature are you suggesting?"
- type: textarea
attributes:
label: Overview
description: Provide an overview of the feature being suggested.
validations:
required: true
- type: textarea
attributes:
label: Why would this feature be useful?
description: |
Describe the benefits of implementing this feature.
validations:
required: true
Loading