Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] barnacle/crab/peenguin?/infra #213

Open
wants to merge 37 commits into
base: 1.19.2
Choose a base branch
from
Open

[WIP] barnacle/crab/peenguin?/infra #213

wants to merge 37 commits into from

Conversation

Faboslav
Copy link
Owner

@Faboslav Faboslav commented May 7, 2024

No description provided.

@Faboslav Faboslav changed the base branch from master to 1.19.2 May 7, 2024 05:08
@Faboslav Faboslav changed the base branch from 1.19.2 to 1.20.1 June 14, 2024 16:05
@Faboslav Faboslav changed the base branch from 1.20.1 to 1.19.2 June 14, 2024 16:06
* 1.19.2: (36 commits)
  fixes
  Better condition check
  2.0.14
  2.0.13
  rascal spawn improvements
  Updated ru_ru translations
  Updated changelog
  Format
  Updated gradle to 8.8 and arch loom to 1.7
  Fixes
  Better teleport logic
  Fixes
  Updated build
  Added more error patterns
  Removed version
  updates
  Fixed workflows
  Used minMinecraftVersion
  Added translations, updated changelog
  Updated changelog
  ...

# Conflicts:
#	CHANGELOG.md
#	build.gradle
#	common/build.gradle
#	common/src/main/java/com/faboslav/friendsandfoes/FriendsAndFoes.java
#	common/src/main/java/com/faboslav/friendsandfoes/block/Oxidizable.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/block/OxidizableButtonBlock.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/events/lifecycle/AddSpawnBiomeModificationsEvent.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/mixin/LightningEntityMixin.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/mixin/LightningRodBlockMixin.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/mixin/LivingEntityMixin.java
#	common/src/main/java/com/faboslav/friendsandfoes/common/util/plugin/MixinExtrasPlugin.java
#	common/src/main/java/com/faboslav/friendsandfoes/init/FriendsAndFoesEntityTypes.java
#	common/src/main/java/com/faboslav/friendsandfoes/mixin/AxeItemMixin.java
#	common/src/main/java/com/faboslav/friendsandfoes/util/WaxableBlocksMap.java
#	fabric/gradle.properties
#	fabric/src/main/java/com/faboslav/friendsandfoes/fabric/FriendsAndFoesFabric.java
#	forge/build.gradle
#	forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java
#	forge/src/main/resources/friendsandfoes-forge.mixins.json
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant