| 
						
					 | 
					
						
						
							
						
						4575164e80
					 | 
					
						
						
							
							Merge branch 'develop' into develop-hannes
						
						
						
						
						
						
						
						# Conflicts:
#	build.gradle
#	src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java 
						
						
					 | 
					
						2025-07-18 21:09:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edf26785a3
					 | 
					
						
						
							
							removed accidental code change
						
						
						
						
						
						
					 | 
					
						2025-04-16 23:45:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d90f5fc28
					 | 
					
						
						
							
							added missing 'this' qualifier
						
						
						
						
						
						
					 | 
					
						2025-04-13 12:59:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						343decb05a
					 | 
					
						
						
							
							added this qualifier to tetris classes
						
						
						
						
						
						
					 | 
					
						2025-04-12 23:53:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36c6c93edb
					 | 
					
						
						
							
							started towerdefense path mechanic
						
						
						
						
						
						
					 | 
					
						2025-04-11 00:51:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						24af27f2e3
					 | 
					
						
						
							
							fixed different player gamemodes in lobby after games
						
						
						
						
						
						
					 | 
					
						2025-03-22 11:11:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13132eace6
					 | 
					
						
						
							
							fixed minestom-pvp version, made stickfight playable
						
						
						
						
						
						
					 | 
					
						2025-03-03 20:28:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d479b69e3
					 | 
					
						
						
							
							updated JumpDive translations
						
						
						
						
						
						
					 | 
					
						2025-03-03 01:31:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ca8ad8bd7
					 | 
					
						
						
							
							added jumpDive game
						
						
						
						
						
						
					 | 
					
						2025-03-03 01:28:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f2ba1e428
					 | 
					
						
						
							
							prevent execution of /hub in api driven rooms
						
						
						
						
						
						
					 | 
					
						2025-03-02 23:40:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5bab1a1ac7
					 | 
					
						
						
							
							fixed skin not being applied properly, made /skin privileged
						
						
						
						
						
						
					 | 
					
						2025-03-02 23:35:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8fdd0487bf
					 | 
					
						
						
							
							updated project to newest minestom commit
						
						
						
						
						
						
					 | 
					
						2025-03-02 23:26:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0ee1e66c9
					 | 
					
						
						
							
							added description message on game start
						
						
						
						
						
						
					 | 
					
						2025-01-02 01:08:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5acb44b0e1
					 | 
					
						
						
							
							disabled player collisions
						
						
						
						
						
						
					 | 
					
						2025-01-01 22:20:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cd849946b
					 | 
					
						
						
							
							fixed elytra race spectators flying elytra
						
						
						
						
						
						
					 | 
					
						2024-12-27 12:02:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a71aca5d6c
					 | 
					
						
						
							
							added missing translations
						
						
						
						
						
						
					 | 
					
						2024-12-27 12:01:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea08ac7a81
					 | 
					
						
						
							
							fixed tnt run falling before start
						
						
						
						
						
						
					 | 
					
						2024-12-27 11:10:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee192c1035
					 | 
					
						
						
							
							fixed some bugs
						
						
						
						
						
						
					 | 
					
						2024-12-27 10:58:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						81dbf16d3f
					 | 
					
						
						
							
							fixed tetris player inputs
						
						
						
						
						
						
					 | 
					
						2024-12-27 10:53:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f03011e4f1
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-12-24 00:26:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9069ead9e9
					 | 
					
						
						
							
							fixed barrier border for terrain generator
						
						
						
						
						
						
					 | 
					
						2024-12-24 00:26:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ced598bfd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-12-23 23:55:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f04f1b33e3
					 | 
					
						
						
							
							added transfer, updated adress
						
						
						
						
						
						
					 | 
					
						2024-12-23 23:55:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0715771bfc
					 | 
					
						
						
							
							add adventure mode for tournament display
						
						
						
						
						
						
					 | 
					
						2024-12-23 23:45:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c18ac59442
					 | 
					
						
						
							
							changed tetris button press value
						
						
						
						
						
						
					 | 
					
						2024-12-23 23:28:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a1ae69f53
					 | 
					
						
						
							
							Merge branch 'refs/heads/develop-tetris' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java
#	src/main/resources/lang/locales.map.csv 
						
						
					 | 
					
						2024-12-16 21:02:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8451463b73
					 | 
					
						
						
							
							updated minestom version
						
						
						
						
						
						
					 | 
					
						2024-12-16 21:00:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba260519e0
					 | 
					
						
						
							
							added new tournament display
						
						
						
						
						
						
					 | 
					
						2024-12-02 15:52:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						378d872283
					 | 
					
						
						
							
							changed computeIfAbsent back to if statement
						
						
						
						
						
						
					 | 
					
						2024-11-24 00:47:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc27c35f1a
					 | 
					
						
						
							
							removed debug outputs
						
						
						
						
						
						
					 | 
					
						2024-11-23 23:58:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18689ac0df
					 | 
					
						
						
							
							fixed score
						
						
						
						
						
						
					 | 
					
						2024-11-23 23:56:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3fe57d5fe9
					 | 
					
						
						
							
							continued fixing pr comments
						
						
						
						
						
						
					 | 
					
						2024-11-23 22:24:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0699206c21
					 | 
					
						
						
							
							started fixing pr comments
						
						
						
						
						
						
					 | 
					
						2024-11-23 14:26:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e663f3f105
					 | 
					
						
						
							
							made tetris spectators invisible, added barrier walls to elytra race
						
						
						
						
						
						
					 | 
					
						2024-11-04 21:53:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55be88b7da
					 | 
					
						
						
							
							removed countdown when no player left
						
						
						
						
						
						
					 | 
					
						2024-11-04 15:04:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc24f28b8f
					 | 
					
						
						
							
							updated pvp, refactored some old code, removed transfer instance
						
						
						
						
						
						
					 | 
					
						2024-11-03 14:57:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cc371a9c12
					 | 
					
						
						
							
							Test game
						
						
						
						
						
						
					 | 
					
						2024-11-02 21:53:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f85ebbbb5d
					 | 
					
						
						
							
							made BoolOption show true or false, shortened tetris Timeout after first death
						
						
						
						
						
						
					 | 
					
						2024-10-24 23:37:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						720d3c8d65
					 | 
					
						
						
							
							changed Player spawn position
						
						
						
						
						
						
					 | 
					
						2024-10-24 23:10:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e397d69d7a
					 | 
					
						
						
							
							added score above playfield
						
						
						
						
						
						
					 | 
					
						2024-10-23 22:43:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6638a48677
					 | 
					
						
						
							
							added combos
						
						
						
						
						
						
					 | 
					
						2024-10-23 17:41:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73a374e529
					 | 
					
						
						
							
							added timeout for tetris and display points at end of PointsWinScore
						
						
						
						
						
						
					 | 
					
						2024-10-23 17:26:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f838317af0
					 | 
					
						
						
							
							centered hold and next tetrominoes
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:53:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c25f5f079
					 | 
					
						
						
							
							changed player spawn position
						
						
						
						
						
						
					 | 
					
						2024-10-23 13:55:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						179fa2e4d7
					 | 
					
						
						
							
							added combat system and options for game list
						
						
						
						
						
						
					 | 
					
						2024-10-23 01:08:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						075db7a91b
					 | 
					
						
						
							
							added border around next and hold tetromino
						
						
						
						
						
						
					 | 
					
						2024-10-22 21:21:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9d00f4f77
					 | 
					
						
						
							
							added tetris to translation file
						
						
						
						
						
						
					 | 
					
						2024-10-22 17:16:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4de66d65a2
					 | 
					
						
						
							
							added anvil run to translation file
						
						
						
						
						
						
					 | 
					
						2024-10-22 17:13:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8594f8029c
					 | 
					
						
						
							
							fixed score at end of tetris not working
						
						
						
						
						
						
					 | 
					
						2024-10-22 17:05:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e192ae4433
					 | 
					
						
						
							
							moved tetris from prototype to other
						
						
						
						
						
						
					 | 
					
						2024-10-22 16:45:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |