From b771c7f088e96ecd0b8abf374d929e0eda249a13 Mon Sep 17 00:00:00 2001 From: erebus Date: Fri, 4 Dec 2020 20:06:00 +0000 Subject: [PATCH] v0.0.4 (#4) v0.0.4 merge fixes Co-Authored-By: erebus Co-Committed-By: erebus --- lang/en.json | 3 --- module/items/item-sheet.js | 3 --- styles/items.css | 4 ---- system.json | 11 +---------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lang/en.json b/lang/en.json index 161623c..0f56b9e 100644 --- a/lang/en.json +++ b/lang/en.json @@ -72,7 +72,6 @@ "MENU.SHOWROLLDIALOG": "Show diceroller dialog", "ROLL.OPENCLOSE": "Open / Close", "ROLL.EXCEPTIONAL": "Exceptional", -<<<<<<< HEAD "SHIP.CARGO": "Cargo capacity", "SHIP.HULL": "Hull", @@ -82,8 +81,6 @@ "SHIP.CREW": "Crew", "SHIP.ARMAMENT": "Armament", "SHIP.RAMMINGDMG": "Ramming damage", -======= ->>>>>>> master "SKILL.TYPE": "Type", "SKILL.BASE": "Basic", diff --git a/module/items/item-sheet.js b/module/items/item-sheet.js index 9868869..1957bf5 100644 --- a/module/items/item-sheet.js +++ b/module/items/item-sheet.js @@ -94,7 +94,6 @@ export class ItemSheetKH extends ItemSheet { skillList.push(item) } } -<<<<<<< HEAD this.position.width = 450; this.position.height = 605; break; @@ -127,8 +126,6 @@ export class ItemSheetKH extends ItemSheet { this.position.width = 405; this.position.height = 570; break; -======= ->>>>>>> master default: this.position.width = 450; this.position.height = 605; diff --git a/styles/items.css b/styles/items.css index 5e6d45a..10bcaae 100644 --- a/styles/items.css +++ b/styles/items.css @@ -102,12 +102,8 @@ .items .items-list .item-weapon, .items .items-list .item-skill, .items .items-list .item-nor, -<<<<<<< HEAD .items .items-list .item-defence, .items .items-list .item-attack { -======= -.items .items-list .item-defence { ->>>>>>> master line-height: 24px; padding: 3px 0; border-bottom: 1px solid #bbb; diff --git a/system.json b/system.json index f4d7f01..07698f4 100644 --- a/system.json +++ b/system.json @@ -2,13 +2,9 @@ "name": "kopparhavet", "title": "Kopparhavets Hjältar", "description": "The Molten Sea is a dangerous but exciting place, where pirates, sorcerers and secretive orders of knighthood struggle for power, wealth and ancient lore.", -<<<<<<< HEAD "version": "0.0.4", -======= - "version": "0.0.3", ->>>>>>> master "minimumCoreVersion": "0.7.5", - "compatibleCoreVersion": "0.7.7", + "compatibleCoreVersion": "0.7.8", "templateVersion": 4, "author": "Erebus", "scripts": [], @@ -85,11 +81,6 @@ "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet", "socket": true, "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json", -<<<<<<< HEAD "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip", "license": "LICENCE.txt" -======= - "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip", - "license": "" ->>>>>>> master }