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: Faboslav/friends-and-foes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: mc1.20.6-2.0.12
Choose a base ref
...
head repository: Faboslav/friends-and-foes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
10 contributors

Commits on Jul 10, 2024

  1. Fixed errors from BC

    @Faboslav
    Faboslav committed Jul 10, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e21ef45 View commit details

Commits on Jul 13, 2024

  1. rascal spawn improvements

    @Faboslav
    Faboslav committed Jul 13, 2024
    Copy the full SHA
    a91f561 View commit details

  2. 2.0.13

    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    d43c899 View commit details

  3. Merge branch '1.19.2' into 1.19.3 

    * 1.19.2:
  2.0.13
  rascal spawn improvements

# Conflicts:
#	common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    1c703ea View commit details

  4. Merge branch '1.19.3' into 1.19.4 

    * 1.19.3:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    9cbe7bf View commit details

  5. Merge branch '1.19.4' into 1.20.1 

    * 1.19.4:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    1afea41 View commit details

  6. Merge branch '1.20.1' into 1.20.2 

    * 1.20.1:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    9ca4078 View commit details

  7. Merge branch '1.20.2' into 1.20.4 

    * 1.20.2:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    9c76c10 View commit details

  8. Merge branch '1.20.4' into 1.20.6 

    * 1.20.4:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    04ad4c0 View commit details

  9. Merge branch '1.20.6' into 1.21 

    * 1.20.6:
  2.0.13
  rascal spawn improvements
    @Faboslav
    Faboslav committed Jul 13, 2024
    Copy the full SHA
    9aa31bc View commit details

  10. NeoForge creative tab fix

    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    58e38c2 View commit details

  11. Merge branch '1.21' 

    * 1.21:
  NeoForge creative tab fix
  2.0.13
  rascal spawn improvements
  Fixed errors from BC
    @Faboslav
    Faboslav committed Jul 13, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c8ea086 View commit details

Commits on Jul 15, 2024

  1. 2.0.14

    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    158a85d View commit details

  2. Merge branch '1.19.2' into 1.19.3 

    * 1.19.2:
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c7871b6 View commit details

  3. port

    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    17d1f77 View commit details

  4. Merge branch '1.19.4' into 1.20.1 

    * 1.19.4:
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    16ae27f View commit details

  5. Merge branch '1.20.1' into 1.20.2 

    * 1.20.1:
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    18b5f1a View commit details

  6. Better condition check

    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    5188a20 View commit details

  7. Merge branch '1.19.2' into 1.19.3 

    * 1.19.2:
  Better condition check
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    d896b41 View commit details

  8. Merge branch '1.19.3' into 1.19.4 

    * 1.19.3:
  Better condition check
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    356752a View commit details

  9. Merge branch '1.19.4' into 1.20.1 

    * 1.19.4:
  Better condition check
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    1db9234 View commit details

  10. Merge branch '1.20.1' into 1.20.2 

    * 1.20.1:
  Better condition check
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8b59839 View commit details

  11. Merge branch '1.20.2' into 1.20.4 

    * 1.20.2:
  Better condition check
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    3df82dd View commit details

  12. Merge branch '1.20.4' into 1.20.6 

    * 1.20.4:
  Better condition check
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    88ec375 View commit details

  13. fix

    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    65a11b4 View commit details

  14. Merge branch '1.21' 

    * 1.21:
  fix
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    bb41d09 View commit details

  15. Merge branch '1.20.6' into 1.21 

    * 1.20.6:
  Better condition check
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8c010ea View commit details

  16. Merge branch '1.21' 

    * 1.21:
  Better condition check
  2.0.14
    @Faboslav
    Faboslav committed Jul 15, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    db0fcad View commit details

Commits on Jul 17, 2024

  1. fixes

    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    f521f21 View commit details

  2. Added missing bamboo beehive

    @Faboslav
    Faboslav committed Jul 17, 2024
    Copy the full SHA
    79cd00a View commit details

  3. Merge branch '1.19.2' into 1.19.3 

    * 1.19.2:
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    50e8045 View commit details

  4. Merge branch '1.19.3' into 1.19.4 

    * 1.19.3:
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    d8366bd View commit details

  5. Merge branch '1.19.4' into 1.20.1 

    * 1.19.4:
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    599d4ae View commit details

  6. Merge branch '1.20.1' into 1.20.2 

    * 1.20.1:
  Added missing bamboo beehive
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    6547961 View commit details

  7. Merge branch '1.20.2' into 1.20.4 

    * 1.20.2:
  Added missing bamboo beehive
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    3d4b944 View commit details

  8. Merge branch '1.20.4' into 1.20.6 

    * 1.20.4:
  Added missing bamboo beehive
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    67bb79d View commit details

  9. Merge branch '1.20.6' into 1.21 

    * 1.20.6:
  Added missing bamboo beehive
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    226566f View commit details

  10. Merge branch '1.21' 

    * 1.21:
  Added missing bamboo beehive
  fixes
    @Faboslav
    Faboslav committed Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    ec46ed2 View commit details

Commits on Aug 8, 2024

  1. Added Brazillian Portuguese Translation (#242) 

    * Added Brazillian Portuguese Translation

Completely translated the en_us.json file into pt-br for better accessibility for pt-br speakers

* Uh oh, missed a few lines
    @chocotoneg
    chocotoneg authored Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    9f4a438 View commit details

  2. 2.0.16

    @Faboslav
    Faboslav committed Aug 8, 2024
    Copy the full SHA
    1e1def1 View commit details

  3. Format

    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    565fa2d View commit details

  4. Merge branch '1.19.2' into 1.19.3 

    * 1.19.2:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    010be40 View commit details

  5. Merge branch '1.19.3' into 1.19.4 

    * 1.19.3:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c7f6899 View commit details

  6. Merge branch '1.19.4' into 1.20.1 

    * 1.19.4:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    89f8bf9 View commit details

  7. Merge branch '1.20.1' into 1.20.2 

    * 1.20.1:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c2505f1 View commit details

  8. Merge branch '1.20.2' into 1.20.4 

    * 1.20.2:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    161c56f View commit details

  9. Merge branch '1.20.4' into 1.20.6 

    * 1.20.4:
  Format
  2.0.16
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    41d7068 View commit details

  10. Merge branch '1.20.6' into 1.21 

    * 1.20.6:
  Format
  2.0.16

# Conflicts:
#	common/src/main/resources/data/minecraft/tags/entity_type/freeze_hurts_extra_types.json
    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    032148c View commit details

  11. 2.0.16

    @Faboslav
    Faboslav committed Aug 8, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    e9d9f0a View commit details

Commits on Sep 4, 2024

  1. 2.0.17

    @Faboslav
    Faboslav committed Sep 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    a3ab93a View commit details
Showing 521 changed files with 13,383 additions and 4,245 deletions.
Loading