Skip to content

[pull] master from klikli-dev:master#11

Open
pull[bot] wants to merge 294 commits intopm065:masterfrom
klikli-dev:master
Open

[pull] master from klikli-dev:master#11
pull[bot] wants to merge 294 commits intopm065:masterfrom
klikli-dev:master

Conversation

@pull
Copy link

@pull pull bot commented Jul 23, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Jul 23, 2021
@ghost
Copy link

ghost commented Jul 23, 2021

Hey there! 👋 This repository uses the Prettier code style.

You forgot to format these files in your pull request:

  • src/generated/resources/assets/occultism/models/item/ritual_dummy/familiar_bat.json
  • src/main/resources/assets/occultism/lang/ru_ru.json
  • src/main/resources/data/forge/tags/entity_types/bats.json
  • src/main/resources/data/occultism/patchouli_books/dictionary_of_spirits/en_us/entries/getting_started/next_steps.json
  • src/main/resources/data/occultism/patchouli_books/dictionary_of_spirits/en_us/entries/pentacles/summon_djinni.json
  • src/main/resources/data/occultism/patchouli_books/dictionary_of_spirits/en_us/entries/rituals/familiars/familiar_bat.json
  • src/main/resources/data/occultism/recipes/ritual/familiar_bat.json

The Prettier installation guide is a good place to get started with formatting your code properly.
Thanks!

❤️

Your friendly Prettifier bot.

@pull pull bot added the merge-conflict Resolve conflicts manually label Jul 23, 2021
vemerion and others added 28 commits September 27, 2021 21:11
Closes #455
- Check for death to invalidate cache
Closese #456
Even hidden advancements are shown once complete

Closes #457
Cthulhu blacksmith upgrade (lantern)
@klikli-dev klikli-dev deleted the branch pm065:master October 9, 2021 14:33
@klikli-dev klikli-dev deleted the master branch October 9, 2021 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments