simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-20 01:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into Missing-aliases-for-Jcc-instruction-family-#190

Browse Source
This commit is contained in:
Kevin Ramharak
2020-07-27 14:36:13 +02:00
parent aed7b359b0 ac27250f98
commit 24c11497eb
8 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/pom.xml
View File

@@ -114,7 +114,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.1.5.RELEASE</version>
<version>5.1.11.RELEASE</version>
</dependency>
<dependency>
<groupId>com.sparkjava</groupId>

1
Server/src/main/resources/config.properties
View File

@@ -93,6 +93,7 @@ electric_box_damage=5
electric_box_energy_given=70
#RadioactiveObstacle
radioactive_obstacle_corruption_block_size=10
radioactive_cloud_corruption_block_size=40
#SecretKey
secret_key=<your_secret_key>

2
Server/src/main/resources/templates/footer.vm
View File

@@ -1,5 +1,5 @@
<div class="container">
<span class="text-muted">©2019 Simon Fortier</span>
<span class="text-muted">©2020 simon987</span>
</div>
<script src="js/popper.min.js"></script>

4
Server/src/main/resources/templates/play.vm
View File

@@ -32,10 +32,10 @@
</li>
<li class="nav-item">
<a class="nav-link regular-screen" target="_blank"
href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg"><i
href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLWRjMjRkZTg2N2EyNWRjN2YyMDc0YzIyMTUyYzFiNTBmMTU3OGQ1ZjA0MWY0M2IyYjUxZTA4NjRkMWVkNDk2NzY"><i
class="mi">chat</i> Slack</a>
<a class="nav-link small-screen" target="_blank"
href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg"><i
href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLWRjMjRkZTg2N2EyNWRjN2YyMDc0YzIyMTUyYzFiNTBmMTU3OGQ1ZjA0MWY0M2IyYjUxZTA4NjRkMWVkNDk2NzY"><i
class="mi">chat</i></a>
</li>
<li class="nav-item">