Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jessev14/Multiattack-5e
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.0.2
Choose a base ref
...
head repository: jessev14/Multiattack-5e
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jan 7, 2022

  1. Update MA5e.js

    jessev14 committed Jan 7, 2022
    Copy the full SHA
    30d8e46 View commit details

Commits on Jan 8, 2022

  1. remove importing of D20Roll

    jessev14 committed Jan 8, 2022
    Copy the full SHA
    eac2895 View commit details
  2. Rename MA5e.js to ma5e.js

    jessev14 authored Jan 8, 2022
    Copy the full SHA
    374debb View commit details
  3. Update ma5e.js

    jessev14 committed Jan 8, 2022
    Copy the full SHA
    c9e6897 View commit details

Commits on Jan 9, 2022

  1. Update release-creation.yml

    jessev14 committed Jan 9, 2022
    Copy the full SHA
    bd5d8c2 View commit details

Commits on Jan 10, 2022

  1. fix midi multiattack

    jessev14 committed Jan 10, 2022
    Copy the full SHA
    d25f9bb View commit details
  2. midi/core roller compat

    jessev14 committed Jan 10, 2022
    Copy the full SHA
    93f8dad View commit details

Commits on May 11, 2022

  1. update for dnd5e v1.6.1

    updated core rolling handler
    jessev14 committed May 11, 2022
    Copy the full SHA
    3e84452 View commit details
  2. Update ma5e.js

    fixed item usage/ammo bug
    jessev14 committed May 11, 2022
    Copy the full SHA
    9f43677 View commit details

Commits on Jun 5, 2022

  1. mre update

    jessev14 committed Jun 5, 2022
    Copy the full SHA
    5feea82 View commit details
  2. Update ma5e.js

    jessev14 committed Jun 5, 2022
    Copy the full SHA
    2affecf View commit details

Commits on Jun 8, 2022

  1. Update ma5e.js

    jessev14 committed Jun 8, 2022
    Copy the full SHA
    74face9 View commit details

Commits on Aug 25, 2022

  1. Delete dnd5e-bug-fix.js

    jessev14 committed Aug 25, 2022
    Copy the full SHA
    b2b0f7c View commit details
  2. Update ma5e.js

    jessev14 committed Aug 25, 2022
    Copy the full SHA
    023adc6 View commit details
  3. Update ma5e.js

    jessev14 committed Aug 25, 2022
    Copy the full SHA
    d51b22f View commit details

Commits on Oct 11, 2022

  1. Copy the full SHA
    ab809fd View commit details

Commits on Oct 12, 2022

  1. version 6

    full package rewrite for V10
    jessev14 committed Oct 12, 2022
    Copy the full SHA
    6e2a095 View commit details
  2. actually version 7

    jessev14 committed Oct 12, 2022
    Copy the full SHA
    7b25bb2 View commit details
  3. Update main.js

    jessev14 committed Oct 12, 2022
    Copy the full SHA
    6bb66ff View commit details

Commits on Nov 22, 2022

  1. Update main.js

    jessev14 committed Nov 22, 2022
    Copy the full SHA
    7c2567e View commit details
  2. Revert "Update main.js"

    This reverts commit 7c2567e.
    jessev14 committed Nov 22, 2022
    Copy the full SHA
    b2d2834 View commit details
  3. flag chat message as ma5e

    jessev14 committed Nov 22, 2022
    Copy the full SHA
    029f5f9 View commit details
45 changes: 45 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Release Creation

on:
release:
types: [published]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

# get part of the tag after the `v`
- name: Extract tag version number
id: get_version
uses: battila7/get-version-action@v2

# Substitute the Manifest and Download URLs in the module.json
- name: Substitute Manifest and Download Links For Versioned Ones
id: sub_manifest_link_version
uses: microsoft/variable-substitution@v1
with:
files: 'module.json'
env:
version: ${{steps.get_version.outputs.version-without-v}}
url: https://github.com/${{github.repository}}
manifest: https://github.com/${{github.repository}}/releases/latest/download/module.json
download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/module.zip

# Create a zip file with all files required by the module to add to the release
- run: zip -r ./module.zip module.json README.md LICENSE styles/ scripts/ templates/ languages/ lib/ img/ packs/

# Create a release for this specific version
- name: Update Release with Files
id: create_version_release
uses: ncipollo/release-action@v1
with:
allowUpdates: true # Set this to false if you want to prevent updating existing releases
name: ${{ github.event.release.name }}
draft: ${{ github.event.release.unpublished }}
prerelease: ${{ github.event.release.prerelease }}
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: './module.json, ./module.zip'
tag: ${{ github.event.release.tag_name }}
body: ${{ github.event.release.body }}
54 changes: 0 additions & 54 deletions .github/workflows/release-creation.yml

This file was deleted.

14 changes: 7 additions & 7 deletions lang/en.json → languages/en.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"MA5e": {
"multiattack-5e": {
"settings": {
"condenseCards": {
"condenseChatMessagesEnabled": {
"name": "Condense Multiple Attack/Damage Rolls"
},
"disableTool": {
"multiattackToolEnabled": {
"name":"Multiattack Tool",
"hint": "Enable tool in token control bar."
},
"playerTool": {
"playerToolEnabled": {
"name": "Multiattack Tool For Players" ,
"hint": "Requires \"Multiattack Tool\" setting enabled."
},
"extraAttackDSN": {
"name": "Animate DsN! for Extra Attacks",
"name": "DsN! for Extra Attacks",
"hint": "Will not affect single attack/damage rolls."
},
"multiattackDSN": {
"name": "Animate DsN! for Multiattacks"
"name": "DsN! for Multiattacks"
},
"betterRollsDSN": {
"name": "Animate DsN! for Better Rolls"
"name": "DsN! for Better Rolls"
},
"disabled": "Disabled",
"attackOnly": "Attack rolls only",
47 changes: 29 additions & 18 deletions module.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
{
"name": "multiattack-5e",
"id": "multiattack-5e",
"title": "Multiattack 5e",
"description": "",
"author": "enso#0361",
"authors": [],
"url": "https://github.com/jessev14/Multiattack-5e",
"authors": [
{
"name": "enso",
"discord": "enso#0361"
}
],
"version": "7.0.0",
"compatibility": {
"minimum": "10",
"verified": "10"
},
"relationships": {
"systems": [
{
"id": "dnd5e",
"type": "system",
"compatibility": {
"minimum": "2.0.0"
}
}
]
},
"flags": {},
"version": "5.0.2",
"minimumCoreVersion": "9",
"compatibleCoreVersion": "9",
"scripts": [],
"esmodules": [
"./scripts/ma5e.js"
"./scripts/main.js"
],
"styles": [
"./styles/multiattack-5e.css"
"./styles/style.css"
],
"languages": [
{
"lang": "en",
"name": "English",
"path": "lang/en.json"
"path": "./languages/en.json"
}
],
"packs": [],
"system": [],
"dependencies": [],
"socket": false,
"manifest": "https://github.com/jessev14/Multiattack-5e/releases/latest/download/module.json",
"download": "https://github.com/jessev14/Multiattack-5e/releases/download/5.0.2/MA5e.zip",
"protected": false,
"coreTranslation": false
"url": "https://github.com/jessev14/Multiattack-5e",
"manifest": "",
"download": ""
}
Loading