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

Merge conflict fix

pull/3/head
Erebus 2020-12-04 20:49:58 +01:00
parent 1a24e7facf 2e389704ea
commit a496eca37f
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/en.json
View File

@ -72,6 +72,7 @@
"MENU.SHOWROLLDIALOG": "Show diceroller dialog", "MENU.SHOWROLLDIALOG": "Show diceroller dialog",
"ROLL.OPENCLOSE": "Open / Close", "ROLL.OPENCLOSE": "Open / Close",
"ROLL.EXCEPTIONAL": "Exceptional", "ROLL.EXCEPTIONAL": "Exceptional",
<<<<<<< HEAD
"SHIP.CARGO": "Cargo capacity", "SHIP.CARGO": "Cargo capacity",
"SHIP.HULL": "Hull", "SHIP.HULL": "Hull",
@ -81,6 +82,8 @@
"SHIP.CREW": "Crew", "SHIP.CREW": "Crew",
"SHIP.ARMAMENT": "Armament", "SHIP.ARMAMENT": "Armament",
"SHIP.RAMMINGDMG": "Ramming damage", "SHIP.RAMMINGDMG": "Ramming damage",
=======
>>>>>>> master
"SKILL.TYPE": "Type", "SKILL.TYPE": "Type",
"SKILL.BASE": "Basic", "SKILL.BASE": "Basic",

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

@ -94,6 +94,7 @@ export class ItemSheetKH extends ItemSheet {
skillList.push(item) skillList.push(item)
} }
} }
<<<<<<< HEAD
this.position.width = 450; this.position.width = 450;
this.position.height = 605; this.position.height = 605;
break; break;
@ -126,6 +127,8 @@ export class ItemSheetKH extends ItemSheet {
this.position.width = 405; this.position.width = 405;
this.position.height = 570; this.position.height = 570;
break; break;
=======
>>>>>>> master
default: default:
this.position.width = 450; this.position.width = 450;
this.position.height = 605; this.position.height = 605;

4
styles/items.css
View File

@ -102,8 +102,12 @@
.items .items-list .item-weapon, .items .items-list .item-weapon,
.items .items-list .item-skill, .items .items-list .item-skill,
.items .items-list .item-nor, .items .items-list .item-nor,
<<<<<<< HEAD
.items .items-list .item-defence, .items .items-list .item-defence,
.items .items-list .item-attack { .items .items-list .item-attack {
=======
.items .items-list .item-defence {
>>>>>>> master
line-height: 24px; line-height: 24px;
padding: 3px 0; padding: 3px 0;
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;

9
system.json
View File

@ -2,7 +2,11 @@
"name": "kopparhavet", "name": "kopparhavet",
"title": "Kopparhavets Hjältar", "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.", "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.4",
=======
"version": "0.0.3",
>>>>>>> master
"minimumCoreVersion": "0.7.5", "minimumCoreVersion": "0.7.5",
"compatibleCoreVersion": "0.7.7", "compatibleCoreVersion": "0.7.7",
"templateVersion": 4, "templateVersion": 4,
@ -81,6 +85,11 @@
"url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet", "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
"socket": true, "socket": true,
"manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json", "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", "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip",
"license": "LICENCE.txt" "license": "LICENCE.txt"
=======
"download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip",
"license": ""
>>>>>>> master
} }