diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
| commit | 797382881f366e733312ee4ae3c59067ffbe171a (patch) | |
| tree | f8c60cd646c9ebb48c0f0071fd19d103c0c958cc /reference/assets/briefcasespeakers/pack.mcmeta | |
| parent | 40ca1a9e481601ca258ec1895e6e10e8f3dec3e0 (diff) | |
| parent | 446f372cb361279f19438a2fa75bfcf85ff67aa8 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
Conflicts:
common/bspkrs/briefcasespeakers/config/ConfigHandler.java
common/bspkrs/briefcasespeakers/item/ItemList.java
Diffstat (limited to 'reference/assets/briefcasespeakers/pack.mcmeta')
| -rw-r--r-- | reference/assets/briefcasespeakers/pack.mcmeta | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/reference/assets/briefcasespeakers/pack.mcmeta b/reference/assets/briefcasespeakers/pack.mcmeta deleted file mode 100644 index 3aab978..0000000 --- a/reference/assets/briefcasespeakers/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 1, - "description": "BriefcaseSpeakers" - } -}
\ No newline at end of file |