Skip to content

Commit

Permalink
Merge pull request #30 from LandOfRails/main
Browse files Browse the repository at this point in the history
Merge main to lor-25-custom-buttons-for-interaction
  • Loading branch information
Danielxs01 authored Nov 20, 2021
2 parents c2dc835 + 2d46a3e commit b45982e
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 15 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on: [ workflow_dispatch ]
# push:
# branches: [ main ]
# pull_request:
# # The branches below must be a subset of the branches above
# branches: [ main ]
# schedule:
# - cron: '44 0 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ universalmodcore {
modName = 'LandOfSignals'
modId = 'landofsignals'
modVersion = version
umcVersion = '1.1.2'
umcVersion = '1.1.3'
}

task('umcIntegration') {
Expand All @@ -40,6 +40,10 @@ configurations {
deployerJars
}

dependencies {
deployerJars "org.apache.maven.wagon:wagon-ssh:2.9"
}

task('showBuildInfo') {
doLast {
String minecraftString = version.split('-')[0]
Expand Down
28 changes: 14 additions & 14 deletions src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[
{
"modid": "landofsignals",
"name": "LandOfSignals",
"description": "",
"version": "0.0.4",
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",
"authorList": [],
"credits": "",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
{
"modid": "landofsignals",
"name": "LandOfSignals",
"description": "",
"version": "0.0.4",
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",
"authorList": [],
"credits": "",
"logoFile": "",
"screenshots": [],
"dependencies": []
}
]

0 comments on commit b45982e

Please sign in to comment.