austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							64e6d60755
							
						
					 | 
					
						
						
							
							closes #25
						
						
						
						
						
						
						
						Unifies gravity and movement trees under common "collidabletree" that
parses impulses from collidable objects 
						
					 | 
					
						2021-10-27 21:56:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							4663573cbc
							
						
					 | 
					
						
						
							
							closes #29
						
						
						
						
						
					 | 
					
						2021-10-26 18:21:30 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							66bec8dead
							
						
					 | 
					
						
						
							
							Add deer
						
						
						
						
						
					 | 
					
						2021-10-24 21:05:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							14d096230a
							
						
					 | 
					
						
						
							
							ui is stupid
						
						
						
						
						
					 | 
					
						2021-10-23 22:45:27 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							194592c18d
							
						
					 | 
					
						
						
							
							Work on integrating sqlite
						
						
						
						
						
					 | 
					
						2021-10-23 16:22:01 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fdb9a23c0
							
						
					 | 
					
						
						
							
							the UI update part 1
						
						
						
						
						
					 | 
					
						2021-10-23 10:10:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc2709aa93
							
						
					 | 
					
						
						
							
							Move work on layout list scrollable
						
						
						
						
						
					 | 
					
						2021-10-20 22:28:36 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3267e52a4d
							
						
					 | 
					
						
						
							
							Start widget rework
						
						
						
						
						
					 | 
					
						2021-10-20 18:49:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							308a34514f
							
						
					 | 
					
						
						
							
							Begin sql integration
						
						
						
						
						
					 | 
					
						2021-10-14 23:23:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							57c2fa1e61
							
						
					 | 
					
						
						
							
							Terrain splatting hopefully working
						
						
						
						
						
					 | 
					
						2021-10-09 16:22:33 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							95829bb847
							
						
					 | 
					
						
						
							
							Working on ground texturing still
						
						
						
						
						
					 | 
					
						2021-10-07 09:09:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							26064dc198
							
						
					 | 
					
						
						
							
							Proper texture tiling for terrain meshes
						
						
						
						
						
					 | 
					
						2021-10-06 19:38:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c295a18a22
							
						
					 | 
					
						
						
							
							Fix terrain stride with dense meshes
						
						
						
						
						
					 | 
					
						2021-10-03 13:49:40 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f004a588a4
							
						
					 | 
					
						
						
							
							Fix light classes with git repo
						
						
						
						
						
					 | 
					
						2021-09-19 18:33:59 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f43e6f5d50
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/LightBuffer.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c4fb20ac3
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/LightEntityUtils.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d98f4517a
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/LightManager.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea1132ee61
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/PointLight.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2685b358f5
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/SpotLight.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0437db3c42
							
						
					 | 
					
						
						
							
							Delete 'src/main/java/electrosphere/renderer/light/ItsBroken_DirectionalLight.java'
						
						
						
						
						
					 | 
					
						2021-09-19 22:24:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							b162bdd8d2
							
						
					 | 
					
						
						
							
							Sync laptop and desktop
						
						
						
						
						
					 | 
					
						2021-09-19 18:16:25 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b3c99b2ff
							
						
					 | 
					
						
						
							
							Work on terrain mesh towards splatting
						
						
						
						
						
					 | 
					
						2021-08-08 14:26:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							f862c104cc
							
						
					 | 
					
						
						
							
							Failure to fix mac rendering
						
						
						
						
						
					 | 
					
						2021-08-08 12:32:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							236eb59274
							
						
					 | 
					
						
						
							
							Convert entity position to double from float
						
						
						
						
						
					 | 
					
						2021-08-08 01:14:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ef9d8c309
							
						
					 | 
					
						
						
							
							Hook user settings into engine more
						
						
						
						
						
					 | 
					
						2021-08-07 17:43:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c663074616
							
						
					 | 
					
						
						
							
							Performance tweaks
						
						
						
						
						
						
						
						(disable vsync, conditional oob) 
						
					 | 
					
						2021-08-05 23:24:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							952f9e30a0
							
						
					 | 
					
						
						
							
							Add foliage!
						
						
						
						
						
					 | 
					
						2021-08-03 22:10:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a1924f8f4
							
						
					 | 
					
						
						
							
							Client side entity instancing
						
						
						
						
						
					 | 
					
						2021-08-03 00:04:57 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3388325838
							
						
					 | 
					
						
						
							
							Fix rendering bug
						
						
						
						
						
					 | 
					
						2021-08-01 21:45:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e1117f9e1
							
						
					 | 
					
						
						
							
							Can place structures
						
						
						
						
						
					 | 
					
						2021-07-26 21:25:31 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							45e28e5568
							
						
					 | 
					
						
						
							
							Fix skybox tracking potentially
						
						
						
						
						
					 | 
					
						2021-07-25 23:34:04 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbbeb0f848
							
						
					 | 
					
						
						
							
							Tuning gravity more
						
						
						
						
						
					 | 
					
						2021-07-21 23:06:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							719a0eaa9c
							
						
					 | 
					
						
						
							
							Gravity "fixes" / Symbolism map skeleton
						
						
						
						
						
					 | 
					
						2021-07-20 00:44:58 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							85f60b038b
							
						
					 | 
					
						
						
							
							Fixing gravity / adding gravity tree
						
						
						
						
						
					 | 
					
						2021-07-20 00:19:07 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f4a764470
							
						
					 | 
					
						
						
							
							Collision/physics engine
						
						
						
						
						
					 | 
					
						2021-07-19 01:21:46 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							f585af6fad
							
						
					 | 
					
						
						
							
							Start work on collision update and virtual sim
						
						
						
						
						
					 | 
					
						2021-07-10 19:43:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cf8a45c63
							
						
					 | 
					
						
						
							
							Better rendering on mac
						
						
						
						
						
					 | 
					
						2021-07-10 13:53:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce6a6b9ad7
							
						
					 | 
					
						
						
							
							Particle system!
						
						
						
						
						
					 | 
					
						2021-07-04 23:50:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							6096a36896
							
						
					 | 
					
						
						
							
							Attack moves
						
						
						
						
						
					 | 
					
						2021-07-04 01:59:01 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							24c984b714
							
						
					 | 
					
						
						
							
							Give homie proper skin
						
						
						
						
						
					 | 
					
						2021-07-03 23:41:29 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4bcc35cbf
							
						
					 | 
					
						
						
							
							First pass at attacking
						
						
						
						
						
						
						
						assumptions created:
creatures always have facing vector
animation frames for attack animation
items attached to attacking creatures have hitboxes 
						
					 | 
					
						2021-07-03 23:25:11 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef6116646a
							
						
					 | 
					
						
						
							
							Overhaul spawning / creatures / items data
						
						
						
						
						
					 | 
					
						2021-06-29 23:32:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c01ab1868
							
						
					 | 
					
						
						
							
							Add goblins
						
						
						
						
						
					 | 
					
						2021-06-29 01:41:26 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5eae8dee7a
							
						
					 | 
					
						
						
							
							Fix desynced hitboxes with animations
						
						
						
						
						
					 | 
					
						2021-06-28 22:40:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d0acb530e
							
						
					 | 
					
						
						
							
							Managing textures in asset manager
						
						
						
						
						
					 | 
					
						2021-06-28 00:41:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							d889e6126c
							
						
					 | 
					
						
						
							
							reorganization + logging + networking fixes
						
						
						
						
						
					 | 
					
						2021-06-27 14:33:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							40565a1c83
							
						
					 | 
					
						
						
							
							Overhaul build process + launcher + file loading
						
						
						
						
						
					 | 
					
						2021-06-25 23:19:09 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							64928852ba
							
						
					 | 
					
						
						
							
							Redo file loading / builds proper jar now
						
						
						
						
						
					 | 
					
						2021-06-20 14:29:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c4f902652
							
						
					 | 
					
						
						
							
							Merge terrain library into main project
						
						
						
						
						
					 | 
					
						2021-06-13 12:57:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							05eefc9c45
							
						
					 | 
					
						
						
							
							actually fix issues
						
						
						
						
						
					 | 
					
						2021-06-11 23:17:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5bf84a8cd
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of ssh://git.austinwhoover.com:222/gitadmin/Renderer into dev
						
						
						
						
						
					 | 
					
						2021-06-11 23:16:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba494b32b5
							
						
					 | 
					
						
						
							
							Use telephone for networking code
						
						
						
						
						
					 | 
					
						2021-06-11 23:13:45 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f90094761
							
						
					 | 
					
						
						
							
							Hitbox Sphere fixes & logic
						
						
						
						
						
					 | 
					
						2021-06-08 20:23:58 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							323a966516
							
						
					 | 
					
						
						
							
							Attaching items to entity's bones
						
						
						
						
						
					 | 
					
						2021-06-07 20:11:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7379afbbc7
							
						
					 | 
					
						
						
							
							Hitboxes!
						
						
						
						
						
					 | 
					
						2021-06-06 01:59:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3269b962d
							
						
					 | 
					
						
						
							
							Arena mode distinction
						
						
						
						
						
					 | 
					
						2021-06-03 22:04:08 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							607abd392c
							
						
					 | 
					
						
						
							
							Basic ui is working! :D
						
						
						
						
						
					 | 
					
						2021-06-03 17:40:30 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bde5a77131
							
						
					 | 
					
						
						
							
							Basic menus
						
						
						
						
						
					 | 
					
						2021-06-02 00:32:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4a7a8d513
							
						
					 | 
					
						
						
							
							Text boxes render!
						
						
						
						
						
					 | 
					
						2021-06-01 22:41:16 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							31e506ff1f
							
						
					 | 
					
						
						
							
							Partway to getting fonts working
						
						
						
						
						
					 | 
					
						2021-06-01 01:05:42 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							152aac2492
							
						
					 | 
					
						
						
							
							First pass at shadows
						
						
						
						
						
					 | 
					
						2021-05-31 18:13:08 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							79cad3a473
							
						
					 | 
					
						
						
							
							Framebuffers
						
						
						
						
						
					 | 
					
						2021-05-28 09:43:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e6979e73a
							
						
					 | 
					
						
						
							
							Add actor, make animation per actor
						
						
						
						
						
					 | 
					
						2021-05-26 22:16:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							329420ae94
							
						
					 | 
					
						
						
							
							Fix controls not firing network events
						
						
						
						
						
					 | 
					
						2021-05-26 19:53:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0b0362e71
							
						
					 | 
					
						
						
							
							First working version of proper networking
						
						
						
						
						
					 | 
					
						2021-05-21 21:19:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								austin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f684d1c722
							
						
					 | 
					
						
						
							
							Behavior trees, Cell management, new humanoid model, animations,
						
						
						
						
						
						
						
						generally a lot of shit 
						
					 | 
					
						2021-05-16 18:20:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							3baf78f599
							
						
					 | 
					
						
						
							
							Performance changes for chunking
						
						
						
						
						
					 | 
					
						2021-04-04 23:30:33 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							716ed65f70
							
						
					 | 
					
						
						
							
							Attempted performance tweaks (caching, etc)
						
						
						
						
						
					 | 
					
						2021-04-04 20:31:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ced329a47
							
						
					 | 
					
						
						
							
							Basic chunking done
						
						
						
						
						
					 | 
					
						2021-04-04 14:58:22 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								satellite
							
						 
					 | 
					
						
						
						
						
							
						
						
							34c5776296
							
						
					 | 
					
						
						
							
							Refactoring, terrain, lots of changes
						
						
						
						
						
					 | 
					
						2021-04-01 23:08:49 -04:00 | 
					
					
						
						
							
							
							
						
					 |