92838e6c50 
					 
					
						
						
							
							Merge branch 'main' into name-fix  
						
						
						
						
					 
					
						2024-11-04 15:13:29 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						998a6b7b04 
					 
					
						
						
							
							Merge pull request 'Recipe unlock fix' ( #11 ) from Gagooby/Server_storage:recipe-unlock into main  
						
						... 
						
						
						
						Reviewed-on: #11 
Reviewed-by: Bruno Rybársky <bruno@brn.systems > 
						
						
					 
					
						2024-11-04 15:13:13 +01:00 
						 
				 
			
				
					
						
							
							
								Gagooby 
							
						 
					 
					
						
						
							
						
						61428a1c9c 
					 
					
						
						
							
							Updated en_us.json so that the blocks name shows up properly in both item and block form  
						
						
						
						
					 
					
						2024-11-04 03:39:08 -05:00 
						 
				 
			
				
					
						
							
							
								Gagooby 
							
						 
					 
					
						
						
							
						
						31a7fc9d03 
					 
					
						
						
							
							Added recipe advancements  
						
						
						
						
					 
					
						2024-11-04 01:41:17 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4be669f41f
	 
					 
					
						
						
							
							Fix some stuff, crafting is broken  
						
						
						
						
					 
					
						2024-11-01 23:24:42 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f1dd6b9c3c 
					 
					
						
						
							
							Improve crafting screen  
						
						
						
						
					 
					
						2024-09-08 08:23:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						af56360fad 
					 
					
						
						
							
							Add radio interaface to loot table  
						
						
						
						
					 
					
						2024-08-24 15:52:36 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7cea6fbf83 
					 
					
						
						
							
							Bugfix  
						
						
						
						
					 
					
						2024-08-23 10:07:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9956589189 
					 
					
						
						
							
							Bugfix  
						
						
						
						
					 
					
						2024-08-21 21:18:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						51ce3a9774 
					 
					
						
						
							
							Fix recursion bug  
						
						
						
						
					 
					
						2024-08-20 18:51:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2c40d3ae3f 
					 
					
						
						
							
							Finish wireless terminals  
						
						
						
						
					 
					
						2024-08-16 19:57:52 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f63a5a36d7 
					 
					
						
						
							
							Do something with the wireless terminal  
						
						
						
						
					 
					
						2024-08-16 13:32:47 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b2247125b2 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main'  
						
						... 
						
						
						
						# Conflicts:
#	gradle.properties 
						
						
					 
					
						2024-08-14 18:33:10 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5439e477e0 
					 
					
						
						
							
							Update  
						
						
						
						
					 
					
						2024-08-14 18:32:47 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						06bfdf2053 
					 
					
						
						
							
							Edit drive sizes  
						
						... 
						
						
						
						Rename items 
						
						
					 
					
						2024-07-31 17:21:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fc33aee9a5 
					 
					
						
						
							
							Add textures from akis  
						
						
						
						
					 
					
						2024-07-27 16:50:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						42f37ea5df 
					 
					
						
						
							
							Fix crafting  
						
						
						
						
					 
					
						2024-07-12 22:09:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6bdacc88fa 
					 
					
						
						
							
							Test fix  
						
						
						
						
					 
					
						2024-07-10 00:11:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e016690fcb 
					 
					
						
						
							
							Fix recipes  
						
						
						
						
					 
					
						2024-07-07 07:41:01 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						887f0fbf9d 
					 
					
						
						
							
							Fix recipes  
						
						
						
						
					 
					
						2024-07-07 07:25:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6cd7c83bb5 
					 
					
						
						
							
							Fix naming and add gamerules  
						
						
						
						
					 
					
						2024-07-06 16:55:54 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						773cb102e3 
					 
					
						
						
							
							Fix pagination  
						
						
						
						
					 
					
						2024-07-06 12:00:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9470264d5e 
					 
					
						
						
							
							Another bugfix hopefully  
						
						
						
						
					 
					
						2024-07-06 10:56:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2c77a08f95 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main'  
						
						
						
						
					 
					
						2024-07-06 10:56:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f1a2e54f41 
					 
					
						
						
							
							Another bugfix hopefully  
						
						
						
						
					 
					
						2024-07-06 10:56:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0e7095b30c 
					 
					
						
						
							
							fix block entity in polymer  
						
						
						
						
					 
					
						2024-07-05 16:50:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a6c9f26f9 
					 
					
						
						
							
							Fix a glitch  
						
						
						
						
					 
					
						2024-07-05 08:10:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ecb926a180 
					 
					
						
						
							
							Fix a glitch  
						
						
						
						
					 
					
						2024-07-05 00:04:34 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b85ab92097 
					 
					
						
						
							
							Clear filter by right click  
						
						
						
						
					 
					
						2024-07-04 19:05:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						460a499307 
					 
					
						
						
							
							Fix filtering  
						
						
						
						
					 
					
						2024-07-04 19:00:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						71a391b9c9 
					 
					
						
						
							
							Change images to indexed  
						
						
						
						
					 
					
						2024-07-04 16:20:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c1f238c928 
					 
					
						
						
							
							Fix crafting and some other bugs  
						
						
						
						
					 
					
						2024-07-04 16:19:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c6b94b2716 
					 
					
						
						
							
							A bit of an update  
						
						
						
						
					 
					
						2024-07-04 13:44:48 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7f8d4b8eb3 
					 
					
						
						
							
							Fix 2  
						
						
						
						
					 
					
						2024-06-27 08:14:58 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f06f07a534 
					 
					
						
						
							
							Fix 1  
						
						
						
						
					 
					
						2024-06-25 18:35:21 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cf956fad5c 
					 
					
						
						
							
							Test  
						
						
						
						
					 
					
						2024-06-25 18:03:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1d27add23a 
					 
					
						
						
							
							Test  
						
						
						
						
					 
					
						2024-06-25 18:03:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						06e5f220bd 
					 
					
						
						
							
							Edit assets  
						
						
						
						
					 
					
						2024-06-23 22:51:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						16d7e58b8a 
					 
					
						
						
							
							Update polymer  
						
						
						
						
					 
					
						2024-06-18 16:07:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						58c84dbf91 
					 
					
						
						
							
							Update polymer  
						
						
						
						
					 
					
						2024-06-14 15:40:05 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						822cf629ad 
					 
					
						
						
							
							Fix  
						
						
						
						
					 
					
						2024-06-14 14:48:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3727cf7a5b 
					 
					
						
						
							
							Update to 1.21  
						
						
						
						
					 
					
						2024-06-14 14:47:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						48479c9a88 
					 
					
						
						
							
							UNFINISHED  
						
						... 
						
						
						
						Add Crafting, improve autosuck
//TODO:
- add into SettingsScreen all containers with taking out, autosuck and putting in
- add block to store hard drives, because chests are too expensive to index
- fix crafting 
						
						
					 
					
						2024-06-04 23:48:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5473358a75 
					 
					
						
						
							
							Add blacklisting  
						
						
						
						
					 
					
						2024-05-28 19:10:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1d4b658400 
					 
					
						
						
							
							Refresh all screens when changing items  
						
						
						
						
					 
					
						2024-05-26 23:22:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						541f19dde6 
					 
					
						
						
							
							Add persistence in BlockEntity, refactor and make tha amount of pages correct when searching  
						
						
						
						
					 
					
						2024-05-26 22:13:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a821bb0e51 
					 
					
						
						
							
							Add right click and store all  
						
						
						
						
					 
					
						2024-05-26 10:48:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a5cd5adb09 
					 
					
						
						
							
							Add hopper insertion support  
						
						
						
						
					 
					
						2024-05-25 16:49:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						621d7514bb 
					 
					
						
						
							
							Allow shift clicking to get as much as possible  
						
						
						
						
					 
					
						2024-05-25 15:00:08 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fce0e3ffa1 
					 
					
						
						
							
							Allow taking out less than a stack if there is not space for more  
						
						
						
						
					 
					
						2024-05-25 12:55:29 +02:00