foundryvtt
/
kopparhavet
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

v0.0.4 (#4) 

v0.0.4 merge fixes
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>
pull/5/head v0.0.4
erebus 2020-12-04 20:06:00 +00:00
parent c103fac27c
commit b771c7f088
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/en.json
View File

@ -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",

3
module/items/item-sheet.js
View File

@ -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;

4
styles/items.css
View File

@ -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;

11
system.json
View File

@ -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
}