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: colorfulFlames/flames
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1
Choose a base ref
...
head repository: colorfulFlames/flames
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.2
Choose a head ref
  • 20 commits
  • 240 files changed
  • 1 contributor

Commits on Oct 6, 2021

  1. Copy the full SHA
    b6f548d View commit details

Commits on Oct 11, 2021

  1. Copy the full SHA
    55807f7 View commit details
  2. Copy the full SHA
    df6204d View commit details
  3. Copy the full SHA
    f2850e2 View commit details
  4. Copy the full SHA
    c8ab4b6 View commit details
  5. Copy the full SHA
    8b10c3e View commit details
  6. Copy the full SHA
    81fa428 View commit details
  7. Fix #23

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    c447589 View commit details
  8. Copy the full SHA
    d87944f View commit details
  9. Fix #21

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    de82eb5 View commit details
  10. Fix #26

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    7f0f280 View commit details
  11. Fix #24

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    8eb30c6 View commit details
  12. Fix #22

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    5f56fb0 View commit details
  13. Fix #20

    SeveralCircles committed Oct 11, 2021
    Copy the full SHA
    1dc6d2b View commit details
  14. Copy the full SHA
    8e6647a View commit details
  15. Update readme.md

    SeveralCircles authored Oct 11, 2021
    Copy the full SHA
    f643136 View commit details
  16. Update readme.md

    SeveralCircles authored Oct 11, 2021
    Copy the full SHA
    6494c48 View commit details
  17. Copy the full SHA
    07c1ad0 View commit details
  18. Create LICENSE

    SeveralCircles authored Oct 11, 2021
    Copy the full SHA
    f715aaa View commit details
  19. Merge pull request #27 from SeveralCircles/master

    Update release/4.2 with changes from master
    SeveralCircles authored Oct 11, 2021
    Copy the full SHA
    cf0eda5 View commit details
Showing with 441 additions and 81,188 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE/bug_report.md
  2. +20 −0 .github/ISSUE_TEMPLATE/feature_request.md
  3. +17 −0 .github/ISSUE_TEMPLATE/quality-of-life-issue.md
  4. +49 −0 .github/workflows/codacy-analysis.yml
  5. BIN .gradle/buildOutputCleanup/buildOutputCleanup.lock
  6. BIN .gradle/buildOutputCleanup/outputFiles.bin
  7. BIN .gradle/checksums/checksums.lock
  8. BIN .gradle/checksums/md5-checksums.bin
  9. BIN .gradle/checksums/sha1-checksums.bin
  10. +128 −0 CODE_OF_CONDUCT.md
  11. +44 −0 CONTRIBUTING.md
  12. +2 −2 Flames/global.properties
  13. +21 −0 LICENSE
  14. +2 −1 build.gradle
  15. BIN build/classes/java/main/com/severalcircles/flames/data/global/GlobalData.class
  16. +0 −98 doc/allclasses-frame.html
  17. +0 −98 doc/allclasses-noframe.html
  18. +0 −259 doc/com/severalcircles/flames/buttonaction/ButtonAction.html
  19. +0 −314 doc/com/severalcircles/flames/buttonaction/ConsentButtonAction.html
  20. +0 −314 doc/com/severalcircles/flames/buttonaction/data/FunFactsButtonAction.html
  21. +0 −314 doc/com/severalcircles/flames/buttonaction/data/ManageUserDataButtonAction.html
  22. +0 −314 doc/com/severalcircles/flames/buttonaction/data/MyDataButtonAction.html
  23. +0 −314 doc/com/severalcircles/flames/buttonaction/data/StatsButtonAction.html
  24. +0 −314 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/DeleteUserDataButtonAction.html
  25. +0 −314 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/FixUserDataButtonAction.html
  26. +0 −314 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/NoDontButtonAction.html
  27. +0 −314 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/ReallyDeleteButtonAction.html
  28. +0 −32 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/package-frame.html
  29. +0 −180 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/package-summary.html
  30. +0 −166 doc/com/severalcircles/flames/buttonaction/data/deleteuserdata/package-tree.html
  31. +0 −32 doc/com/severalcircles/flames/buttonaction/data/package-frame.html
  32. +0 −180 doc/com/severalcircles/flames/buttonaction/data/package-summary.html
  33. +0 −166 doc/com/severalcircles/flames/buttonaction/data/package-tree.html
  34. +0 −33 doc/com/severalcircles/flames/buttonaction/package-frame.html
  35. +0 −183 doc/com/severalcircles/flames/buttonaction/package-summary.html
  36. +0 −167 doc/com/severalcircles/flames/buttonaction/package-tree.html
  37. +0 −311 doc/com/severalcircles/flames/command/DebugCommand.html
  38. +0 −254 doc/com/severalcircles/flames/command/FlamesCommand.html
  39. +0 −311 doc/com/severalcircles/flames/command/HelpCommand.html
  40. +0 −311 doc/com/severalcircles/flames/command/TestCommand.html
  41. +0 −311 doc/com/severalcircles/flames/command/connections/ArtistCommand.html
  42. +0 −29 doc/com/severalcircles/flames/command/connections/package-frame.html
  43. +0 −168 doc/com/severalcircles/flames/command/connections/package-summary.html
  44. +0 −163 doc/com/severalcircles/flames/command/connections/package-tree.html
  45. +0 −311 doc/com/severalcircles/flames/command/data/GlobalDataCommand.html
  46. +0 −311 doc/com/severalcircles/flames/command/data/HiCommand.html
  47. +0 −311 doc/com/severalcircles/flames/command/data/MyDataCommand.html
  48. +0 −31 doc/com/severalcircles/flames/command/data/package-frame.html
  49. +0 −176 doc/com/severalcircles/flames/command/data/package-summary.html
  50. +0 −165 doc/com/severalcircles/flames/command/data/package-tree.html
  51. +0 −35 doc/com/severalcircles/flames/command/package-frame.html
  52. +0 −191 doc/com/severalcircles/flames/command/package-summary.html
  53. +0 −169 doc/com/severalcircles/flames/command/package-tree.html
  54. +0 −427 doc/com/severalcircles/flames/data/base/FlamesData.html
  55. +0 −323 doc/com/severalcircles/flames/data/base/FlushRunnable.html
  56. +0 −30 doc/com/severalcircles/flames/data/base/package-frame.html
  57. +0 −172 doc/com/severalcircles/flames/data/base/package-summary.html
  58. +0 −168 doc/com/severalcircles/flames/data/base/package-tree.html
  59. +0 −390 doc/com/severalcircles/flames/data/global/GlobalData.html
  60. +0 −29 doc/com/severalcircles/flames/data/global/package-frame.html
  61. +0 −168 doc/com/severalcircles/flames/data/global/package-summary.html
  62. +0 −163 doc/com/severalcircles/flames/data/global/package-tree.html
  63. +0 −679 doc/com/severalcircles/flames/data/user/FlamesUser.html
  64. +0 −531 doc/com/severalcircles/flames/data/user/UserFunFacts.html
  65. +0 −619 doc/com/severalcircles/flames/data/user/UserStats.html
  66. +0 −31 doc/com/severalcircles/flames/data/user/package-frame.html
  67. +0 −176 doc/com/severalcircles/flames/data/user/package-summary.html
  68. +0 −165 doc/com/severalcircles/flames/data/user/package-tree.html
  69. +0 −253 doc/com/severalcircles/flames/events/FlamesDiscordEvent.html
  70. +0 −378 doc/com/severalcircles/flames/events/discord/ButtonEvent.html
  71. +0 −340 doc/com/severalcircles/flames/events/discord/CommandEvent.html
  72. +0 −252 doc/com/severalcircles/flames/events/discord/FlamesDiscordEvent.html
  73. +0 −340 doc/com/severalcircles/flames/events/discord/MemberAddEvent.html
  74. +0 −420 doc/com/severalcircles/flames/events/discord/MessageEvent.html
  75. +0 −36 doc/com/severalcircles/flames/events/discord/package-frame.html
  76. +0 −195 doc/com/severalcircles/flames/events/discord/package-summary.html
  77. +0 −174 doc/com/severalcircles/flames/events/discord/package-tree.html
  78. +0 −192 doc/com/severalcircles/flames/events/flames/FlamesEvent.html
  79. +0 −29 doc/com/severalcircles/flames/events/flames/package-frame.html
  80. +0 −168 doc/com/severalcircles/flames/events/flames/package-summary.html
  81. +0 −159 doc/com/severalcircles/flames/events/flames/package-tree.html
  82. +0 −29 doc/com/severalcircles/flames/events/package-frame.html
  83. +0 −168 doc/com/severalcircles/flames/events/package-summary.html
  84. +0 −159 doc/com/severalcircles/flames/events/package-tree.html
  85. +0 −357 doc/com/severalcircles/flames/features/Analysis.html
  86. +0 −300 doc/com/severalcircles/flames/features/FlamesPrettyDate.html
  87. +0 −304 doc/com/severalcircles/flames/features/NowEnteringGuild.html
  88. +0 −289 doc/com/severalcircles/flames/features/external/ExternalConnectionFailedException.html
  89. +0 −305 doc/com/severalcircles/flames/features/external/ParameterStringBuilder.html
  90. +0 −33 doc/com/severalcircles/flames/features/external/package-frame.html
  91. +0 −183 doc/com/severalcircles/flames/features/external/package-summary.html
  92. +0 −172 doc/com/severalcircles/flames/features/external/package-tree.html
  93. +0 −360 doc/com/severalcircles/flames/features/external/severalcircles/FlamesAssets.html
  94. +0 −29 doc/com/severalcircles/flames/features/external/severalcircles/package-frame.html
  95. +0 −168 doc/com/severalcircles/flames/features/external/severalcircles/package-summary.html
  96. +0 −163 doc/com/severalcircles/flames/features/external/severalcircles/package-tree.html
  97. +0 −309 doc/com/severalcircles/flames/features/external/spotify/ReconnectRunnable.html
  98. +0 −531 doc/com/severalcircles/flames/features/external/spotify/SpotifyArtist.html
  99. +0 −408 doc/com/severalcircles/flames/features/external/spotify/SpotifyConnection.html
  100. +0 −31 doc/com/severalcircles/flames/features/external/spotify/package-frame.html
  101. +0 −176 doc/com/severalcircles/flames/features/external/spotify/package-summary.html
  102. +0 −165 doc/com/severalcircles/flames/features/external/spotify/package-tree.html
  103. +0 −31 doc/com/severalcircles/flames/features/package-frame.html
  104. +0 −176 doc/com/severalcircles/flames/features/package-summary.html
  105. +0 −165 doc/com/severalcircles/flames/features/package-tree.html
  106. +0 −476 doc/com/severalcircles/flames/features/rank/Rank.html
  107. +0 −385 doc/com/severalcircles/flames/features/rank/Ranking.html
  108. +0 −33 doc/com/severalcircles/flames/features/rank/package-frame.html
  109. +0 −183 doc/com/severalcircles/flames/features/rank/package-summary.html
  110. +0 −175 doc/com/severalcircles/flames/features/rank/package-tree.html
  111. +0 −352 doc/com/severalcircles/flames/features/safety/Consent.html
  112. +0 −264 doc/com/severalcircles/flames/features/safety/EmotionMessages.html
  113. +0 −30 doc/com/severalcircles/flames/features/safety/package-frame.html
  114. +0 −172 doc/com/severalcircles/flames/features/safety/package-summary.html
  115. +0 −164 doc/com/severalcircles/flames/features/safety/package-tree.html
  116. +0 −366 doc/com/severalcircles/flames/system/Flames.html
  117. +0 −289 doc/com/severalcircles/flames/system/WhatTheFuckException.html
  118. +0 −33 doc/com/severalcircles/flames/system/package-frame.html
  119. +0 −183 doc/com/severalcircles/flames/system/package-summary.html
  120. +0 −172 doc/com/severalcircles/flames/system/package-tree.html
  121. +0 −398 doc/com/severalcircles/flames/system/updater/DataChange.html
  122. +0 −305 doc/com/severalcircles/flames/system/updater/FlamesUpdater.html
  123. +0 −33 doc/com/severalcircles/flames/system/updater/package-frame.html
  124. +0 −183 doc/com/severalcircles/flames/system/updater/package-summary.html
  125. +0 −175 doc/com/severalcircles/flames/system/updater/package-tree.html
  126. +0 −301 doc/constant-values.html
  127. +0 −178 doc/deprecated-list.html
  128. +0 −21 doc/element-list
  129. +0 −251 doc/help-doc.html
  130. +0 −207 doc/index-files/index-1.html
  131. +0 −327 doc/index-files/index-10.html
  132. +0 −169 doc/index-files/index-11.html
  133. +0 −169 doc/index-files/index-12.html
  134. +0 −184 doc/index-files/index-13.html
  135. +0 −259 doc/index-files/index-14.html
  136. +0 −382 doc/index-files/index-15.html
  137. +0 −308 doc/index-files/index-16.html
  138. +0 −192 doc/index-files/index-17.html
  139. +0 −212 doc/index-files/index-18.html
  140. +0 −267 doc/index-files/index-19.html
  141. +0 −184 doc/index-files/index-2.html
  142. +0 −385 doc/index-files/index-20.html
  143. +0 −188 doc/index-files/index-21.html
  144. +0 −198 doc/index-files/index-22.html
  145. +0 −215 doc/index-files/index-23.html
  146. +0 −217 doc/index-files/index-24.html
  147. +0 −250 doc/index-files/index-3.html
  148. +0 −173 doc/index-files/index-4.html
  149. +0 −232 doc/index-files/index-5.html
  150. +0 −205 doc/index-files/index-6.html
  151. +0 −380 doc/index-files/index-7.html
  152. +0 −180 doc/index-files/index-8.html
  153. +0 −201 doc/index-files/index-9.html
  154. +0 −83 doc/index.html
  155. +0 −9,789 doc/jquery/external/jquery/jquery.js
  156. BIN doc/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
  157. BIN doc/jquery/images/ui-bg_flat_75_ffffff_40x100.png
  158. BIN doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
  159. BIN doc/jquery/images/ui-bg_glass_65_ffffff_1x400.png
  160. BIN doc/jquery/images/ui-bg_glass_75_dadada_1x400.png
  161. BIN doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
  162. BIN doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
  163. BIN doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  164. BIN doc/jquery/images/ui-icons_222222_256x240.png
  165. BIN doc/jquery/images/ui-icons_2e83ff_256x240.png
  166. BIN doc/jquery/images/ui-icons_454545_256x240.png
  167. BIN doc/jquery/images/ui-icons_888888_256x240.png
  168. BIN doc/jquery/images/ui-icons_cd0a0a_256x240.png
  169. +0 −9,789 doc/jquery/jquery-1.10.2.js
  170. +0 −544 doc/jquery/jquery-ui.css
  171. +0 −2,610 doc/jquery/jquery-ui.js
  172. +0 −7 doc/jquery/jquery-ui.min.css
  173. +0 −7 doc/jquery/jquery-ui.min.js
  174. +0 −152 doc/jquery/jquery-ui.structure.css
  175. +0 −5 doc/jquery/jquery-ui.structure.min.css
  176. +0 −56 doc/jquery/jszip-utils/dist/jszip-utils-ie.js
  177. +0 −10 doc/jquery/jszip-utils/dist/jszip-utils-ie.min.js
  178. +0 −118 doc/jquery/jszip-utils/dist/jszip-utils.js
  179. +0 −10 doc/jquery/jszip-utils/dist/jszip-utils.min.js
  180. +0 −9,155 doc/jquery/jszip/dist/jszip.js
  181. +0 −14 doc/jquery/jszip/dist/jszip.min.js
  182. +0 −1 doc/member-search-index.js
  183. BIN doc/member-search-index.zip
  184. +0 −563 doc/org/json/CDL.html
  185. +0 −417 doc/org/json/Cookie.html
  186. +0 −349 doc/org/json/CookieList.html
  187. +0 −424 doc/org/json/HTTP.html
  188. +0 −331 doc/org/json/HTTPTokener.html
  189. +0 −2,486 doc/org/json/JSONArray.html
  190. +0 −349 doc/org/json/JSONException.html
  191. +0 −634 doc/org/json/JSONML.html
  192. +0 −3,098 doc/org/json/JSONObject.html
  193. +0 −369 doc/org/json/JSONPointer.Builder.html
  194. +0 −453 doc/org/json/JSONPointer.html
  195. +0 −316 doc/org/json/JSONPointerException.html
  196. +0 −191 doc/org/json/JSONPropertyIgnore.html
  197. +0 −245 doc/org/json/JSONPropertyName.html
  198. +0 −263 doc/org/json/JSONString.html
  199. +0 −369 doc/org/json/JSONStringer.html
  200. +0 −755 doc/org/json/JSONTokener.html
  201. +0 −667 doc/org/json/JSONWriter.html
  202. +0 −339 doc/org/json/Property.html
  203. +0 −960 doc/org/json/XML.html
  204. +0 −709 doc/org/json/XMLParserConfiguration.html
  205. +0 −565 doc/org/json/XMLTokener.html
  206. +0 −286 doc/org/json/XMLXsiTypeConverter.html
  207. +0 −60 doc/org/json/package-frame.html
  208. +0 −344 doc/org/json/package-summary.html
  209. +0 −212 doc/org/json/package-tree.html
  210. +0 −54 doc/overview-frame.html
  211. +0 −241 doc/overview-summary.html
  212. +0 −299 doc/overview-tree.html
  213. +0 −1 doc/package-search-index.js
  214. BIN doc/package-search-index.zip
  215. BIN doc/resources/glass.png
  216. BIN doc/resources/x.png
  217. +0 −204 doc/script.js
  218. +0 −350 doc/search.js
  219. +0 −196 doc/serialized-form.html
  220. +0 −900 doc/stylesheet.css
  221. +0 −1 doc/type-search-index.js
  222. BIN doc/type-search-index.zip
  223. +6 −2 readme.md
  224. +6 −5 src/main/java/com/severalcircles/flames/api/DataController.java
  225. +12 −0 src/main/java/com/severalcircles/flames/api/DataViewController.java
  226. +42 −0 src/main/java/com/severalcircles/flames/api/FlamesErrorController.java
  227. +2 −2 src/main/java/com/severalcircles/flames/buttonaction/data/MyDataButtonAction.java
  228. +1 −1 src/main/java/com/severalcircles/flames/command/data/MyDataCommand.java
  229. +2 −1 src/main/java/com/severalcircles/flames/data/base/ConsentException.java
  230. +1 −0 src/main/java/com/severalcircles/flames/data/global/GlobalData.java
  231. +1 −1 src/main/java/com/severalcircles/flames/events/CommandEvent.java
  232. +4 −3 src/main/java/com/severalcircles/flames/events/MessageEvent.java
  233. +1 −1 src/main/java/com/severalcircles/flames/features/Analysis.java
  234. +12 −12 src/main/java/com/severalcircles/flames/features/FlamesPrettyDate.java
  235. +2 −1 src/main/java/com/severalcircles/flames/features/safety/Consent.java
  236. +3 −3 src/main/java/com/severalcircles/flames/system/Flames.java
  237. +16 −0 src/main/resources/templates/error.html
  238. +16 −0 src/main/resources/templates/error/404.html
  239. +16 −0 src/main/resources/templates/error/418.html
  240. +14 −0 src/main/resources/templates/view/user.html
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Create a report to help us improve
about: Something isn't working the way it should
title: ''
labels: bug
assignees: SeveralCircles
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Something that should be here isn't
title: 'Feature Request: [title]'
labels: enhancement
assignees: SeveralCircles

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/quality-of-life-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Quality of Life Issue
about: Something works as intended, but the way it's intended doesn't make sense.
title: Quality of Life Issue in (feature)
labels: ''
assignees: SeveralCircles

---

**Feature**
Describe the feature(s) this issue impacts.

**Current System**
Briefly describe the current system and the issue you have with it.

**Proposed System**
Describe how you think this feature *should* work. Provide detailed descriptions and, if you want, add a mock-up image.
49 changes: 49 additions & 0 deletions .github/workflows/codacy-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This workflow checks out code, performs a Codacy security scan
# and integrates the results with the
# GitHub Advanced Security code scanning feature. For more information on
# the Codacy security scan action usage and parameters, see
# https://github.com/codacy/codacy-analysis-cli-action.
# For more information on Codacy Analysis CLI in general, see
# https://github.com/codacy/codacy-analysis-cli.

name: Codacy Security Scan

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '16 22 * * 5'

jobs:
codacy-security-scan:
name: Codacy Security Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v2

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@1.1.0
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues
gh-code-scanning-compat: true
# Force 0 exit code to allow SARIF file generation
# This will handover control about PR rejection to the GitHub side
max-allowed-issues: 2147483647

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v1
with:
sarif_file: results.sarif
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file modified .gradle/checksums/checksums.lock
Binary file not shown.
Binary file modified .gradle/checksums/md5-checksums.bin
Binary file not shown.
Binary file modified .gradle/checksums/sha1-checksums.bin
Binary file not shown.
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
44 changes: 44 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Contributing to Flames
We're so happy you want to help out. We could certainly use your help! Whether it's:
- Reporting a bug
- Discussing the current state of the code
- Submitting a fix
- Proposing new features
- Becoming a maintainer
...we're very excited to work with you!
## We Develop with Github
We use GitHub to host code, to track issues and feature requests, as well as accept pull requests.

## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:

1. Fork the repo and create your branch from `master`.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. Ensure the test suite passes.
5. Make sure your code lints.
6. Issue that pull request!

## Any contributions you make will be under the MIT Software License
In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.

## Report bugs using Github's [issues](https://github.com/briandk/flames/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](); it's that easy!

**Great Bug Reports** tend to have:

- A quick summary and/or background
- Steps to reproduce
- Be specific!
- What you expected would happen
- What actually happens
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)

We *love* thorough bug reports. I'm not even kidding.


## License
By contributing, you agree that your contributions will be licensed under its MIT License.

## References
This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md)
4 changes: 2 additions & 2 deletions Flames/global.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Flames Global Data File
#Thu Oct 07 16:13:52 EDT 2021
#Sun Oct 10 16:40:31 EDT 2021
globalScore=1210
participants=0
participants=1
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021 Aidan Veney

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ plugins {

mainClassName = 'com.severalcircles.flames.system.Flames'

version '4.1'
version '4.2'
def jdaVersion = '4.3.0_277'

sourceCompatibility = targetCompatibility = 1.8
@@ -32,6 +32,7 @@ dependencies {
implementation 'com.bugsnag:bugsnag:3.6.2'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
testImplementation 'org.springframework.boot:spring-boot-starter-test'

}
Binary file not shown.
Loading