Skip to content

[pull] master from Vazkii:master#3

Open
pull[bot] wants to merge 271 commits intopm065:masterfrom
VazkiiMods:master
Open

[pull] master from Vazkii:master#3
pull[bot] wants to merge 271 commits intopm065:masterfrom
VazkiiMods:master

Conversation

@pull
Copy link

@pull pull bot commented Jun 30, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

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

@ghost
Copy link

ghost commented Jun 30, 2021

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

You forgot to format these files in your pull request:

  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/bald_eagle_challenge.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/dimensional_carver.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/falconry_glove.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/falconry_hood.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/mysterious_worm.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/tame_bald_eagle.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/tame_tarantula_hawk.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/tarantula_hawk.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/tigers_blessing.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/void_worm_kill.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/void_worm_split.json
  • openloader/data/crucial_data_v6/data/alexsmobs/advancements/alexsmobs/void_worm_summon.json
  • openloader/data/crucial_data_v6/data/crucial/advancements/crucial/get_all_music_discs.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/building_blocks.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/compressed_blocks.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/decoration_blocks.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/functional_blocks.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/light_sources.json
  • openloader/data/crucial_data_v6/data/crucial/tags/items/categories/useful_items.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 ⤵️ pull merge-conflict Resolve conflicts manually labels Jun 30, 2021
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.