Fix reabse problem with mcl_inventory

This commit is contained in:
AFCMS 2023-06-29 08:23:44 +02:00
parent cd6dd4d851
commit 0e13190ea4
No known key found for this signature in database
GPG key ID: 8720389A25B652E3

View file

@ -1,10 +1,5 @@
name = mcl_inventory
author = BlockMen
description = Adds the player inventory and creative inventory.
<<<<<<< HEAD
depends = mcl_init, mcl_formspec, mcl_enchanting, mcl_player
optional_depends = mcl_armor, mcl_brewing, mcl_potions, mcl_enchanting, mcl_craftguide
=======
depends = mcl_init, mcl_formspec, mcl_enchanting, mcl_gamemode
optional_depends = mcl_armor, mcl_brewing, mcl_potions, mcl_enchanting, mcl_craftguide, mcl_player
>>>>>>> a2429154d (survival inventory tabs API + mcl_gamemode)