| 
							
						 | 
						
							
							
							
							
								
							
							
								1c927c6b32
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/2.X' into 2.X
							
							
							
							
							
							
							
							# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	plugin/build.gradle 
							
						 | 
						
							2025-07-27 00:45:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								95432d438e
								
							
						 | 
						
							
							
								
								chore: bump PacketEvents to 2.8.0 fix: baby property and a mem leak add: zombie related properties
							
							
							
							
							
						 | 
						
							2025-05-15 23:33:06 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c34a665692
								
							
						 | 
						
							
							
								
								chore: Add method to delete npc using UUID
							
							
							
							
							
						 | 
						
							2025-04-18 12:26:23 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mqzn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0258450383
								
							
						 | 
						
							
							
								
								Added skin descriptor fetching by UUID
							
							
							
							
							
						 | 
						
							2025-03-20 15:05:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0bcbcf7a3
								
							
						 | 
						
							
							
								
								expose file descriptor in api
							
							
							
							
							
						 | 
						
							2024-12-29 13:49:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3b8635477
								
							
						 | 
						
							
							
								
								expose save and reload in npc registry to the api
							
							
							
							
							
						 | 
						
							2024-12-24 16:14:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								c780c0ec78
								
							
						 | 
						
							
							
								
								add npc serialization methods to the api
							
							
							
							
							
						 | 
						
							2024-12-24 16:11:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								e30d6a5782
								
							
						 | 
						
							
							
								
								fix concurrency issues in Viewable by making all view tasks execute one by one through a queue
							
							
							
							
							
						 | 
						
							2024-12-18 07:05:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8cd7282bb5
								
							
						 | 
						
							
							
								
								feat: added skeleton_type property
							
							
							
							
							
						 | 
						
							2024-12-17 23:55:05 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								9303d74f8f
								
							
						 | 
						
							
							
								
								remove whitespace
							
							
							
							
							
						 | 
						
							2024-12-15 10:46:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca89bfe32d
								
							
						 | 
						
							
							
								
								move annotations dependency to main gradle file because both subprojects use it
							
							
							
							
							
						 | 
						
							2024-12-15 10:46:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dablakbandit
								
							 
						 | 
						
							
							
							
							
								
							
							
								238a1fe224
								
							
						 | 
						
							
							
								
								Add vehicles by entity id
							
							
							
							
							
							
							
							Add vehicles by entity id for cases where the entity is an existing server npc 
							
						 | 
						
							2024-12-15 10:46:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dablakbandit
								
							 
						 | 
						
							
							
							
							
								
							
							
								c5bf8dea0b
								
							
						 | 
						
							
							
								
								Add passengers to npc api
							
							
							
							
							
							
							
							Add passengers to npc api & implementation
Add jetbrains annotations to api to tag with nullables 
							
						 | 
						
							2024-12-15 10:46:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								bf0b58b4b6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/2.X' into 2.X
							
							
							
							
							
							
							
							# Conflicts:
#	plugin/build.gradle 
							
						 | 
						
							2024-11-26 17:39:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								d02d0cb5e9
								
							
						 | 
						
							
							
								
								expose Npc#getWorldName
							
							
							
							
							
						 | 
						
							2024-08-19 17:52:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c99681561
								
							
						 | 
						
							
							
								
								expose Npc#setWorld in the api
							
							
							
							
							
						 | 
						
							2024-08-19 17:45:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								edee3efe36
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/2.X' into 2.X
							
							
							
							
							
							
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
							
							# Conflicts:
#	api/src/main/java/lol/pyr/znpcsplus/api/interaction/ActionRegistry.java 
							
						 | 
						
							2024-07-13 23:44:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								18c5cc0e24
								
							
						 | 
						
							
							
								
								fix typo
							
							
							
							
							
						 | 
						
							2024-07-04 00:26:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7a82d55e7
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/2.X' into 2.X
							
							
							
							
							
						 | 
						
							2024-07-04 00:25:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								06889a221e
								
							
						 | 
						
							
							
								
								make npc property registry accessible during onLoad
							
							
							
							
							
						 | 
						
							2024-07-04 00:25:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								aafdf0b3f9
								
							
						 | 
						
							
							
								
								update to mc 1.21
							
							
							
							
							
						 | 
						
							2024-07-01 10:12:52 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1b0ab5e455
								
							
						 | 
						
							
							
								
								chore: expose api methods we need
							
							
							
							
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
							
						 | 
						
							2024-06-25 01:07:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1cea2a860
								
							
						 | 
						
							
							
								
								expose action registry to api and added action factory
							
							
							
							
							
						 | 
						
							2024-06-24 23:30:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									bridge
								
							 
						 | 
						
							
							
							
							
								
							
							
								e61ff12b4f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/2.X' into 2.X
							
							
							
							
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	
				continuous-integration/drone Build is failing 
				
			 
		
		
	 
 
	 
							
						 | 
						
							2024-06-13 00:24:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								26442f2e3e
								
							
						 | 
						
							
							
								
								expose action registry to api and added action factory
							
							
							
							
							
						 | 
						
							2024-06-11 21:29:38 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								384cc719e9
								
							
						 | 
						
							
							
								
								expose hologram refresh delay in api
							
							
							
							
							
						 | 
						
							2024-06-06 21:18:21 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3a4baaf1dc
								
							
						 | 
						
							
							
								
								added armadillo npc and wolf variant property
							
							
							
							
							
						 | 
						
							2024-05-29 23:15:21 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								7605841694
								
							
						 | 
						
							
							
								
								add getItemProperty
							
							
							
							
							
						 | 
						
							2024-05-17 03:53:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
							
							
								
							
							
								7607541583
								
							
						 | 
						
							
							
								
								villager_profession property for 1.13 and below
							
							
							
							
							
						 | 
						
							2024-05-05 20:01:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4e75868a73
								
							
						 | 
						
							
							
								
								villager_profession property for 1.13 and below
							
							
							
							
							
						 | 
						
							2024-04-30 20:47:55 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									bridge
								
							 
						 | 
						
							
							
							
							
								
							
							
								02de7378c8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/2.X' into 2.X
							
							
							
							
							
						 | 
						
							2024-03-30 20:08:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								5213476d15
								
							
						 | 
						
							
							
								
								add hand swinging
							
							
							
							
							
						 | 
						
							2024-02-16 18:35:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								22108fd6d9
								
							
						 | 
						
							
							
								
								revert blacklist api
							
							
							
							
							
						 | 
						
							2024-02-16 17:33:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ebd0070b8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'alexdev03/2.X' into alexdev032.X
							
							
							
							
							
							
							
							# Conflicts:
#	plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java 
							
						 | 
						
							2024-02-16 17:31:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4bb24c888
								
							
						 | 
						
							
							
								
								fix itemstack properties in the api
							
							
							
							
							
						 | 
						
							2024-02-16 17:29:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2400b42f5
								
							
						 | 
						
							
							
								
								revert blacklist api
							
							
							
							
							
						 | 
						
							2024-02-16 17:25:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									AlexDev_
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7d12f8192
								
							
						 | 
						
							
							
								
								Fixed itemstack/equipment error
							
							
							
							
							
							
							
							Fixed packet events error
Added blacklist api methods 
							
						 | 
						
							2024-02-16 17:25:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									AlexDev_
								
							 
						 | 
						
							
							
							
							
								
							
							
								475c49c7e2
								
							
						 | 
						
							
							
								
								Fixed itemstack/equipment error
							
							
							
							
							
							
							
							Fixed packet events error
Added blacklist api methods 
							
						 | 
						
							2024-02-13 22:48:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a1f44b1bb
								
							
						 | 
						
							
							
								
								expose skin texture methods in api
							
							
							
							
							
						 | 
						
							2024-01-07 18:26:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								ae1dd25a9a
								
							
						 | 
						
							
							
								
								feat(ci): add drone
							
							
							
							
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
							
						 | 
						
							2023-12-20 18:30:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb90135dd2
								
							
						 | 
						
							
							
								
								expose viewer list in api
							
							
							
							
							
						 | 
						
							2023-11-30 20:19:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								5bec816d02
								
							
						 | 
						
							
							
								
								expose entity id in api
							
							
							
							
							
						 | 
						
							2023-11-30 20:18:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								93c6a42124
								
							
						 | 
						
							
							
								
								fix all of the javadoc warnings
							
							
							
							
							
						 | 
						
							2023-10-31 20:25:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								416ae104fe
								
							
						 | 
						
							
							
								
								switch it back to arrows from square brackets using html escape codes
							
							
							
							
							
						 | 
						
							2023-10-31 20:18:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								85f6114af4
								
							
						 | 
						
							
							
								
								actually fix the javadoc
							
							
							
							
							
						 | 
						
							2023-10-31 20:16:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								b400db4b4f
								
							
						 | 
						
							
							
								
								attempt to fix the javadoc
							
							
							
							
							
						 | 
						
							2023-10-31 20:15:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1ddf509f89
								
							
						 | 
						
							
							
								
								more javadocs
							
							
							
							
							
						 | 
						
							2023-11-01 00:39:58 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								2264ff3d71
								
							
						 | 
						
							
							
								
								convert the color class to an enum & move it to the api package
							
							
							
							
							
						 | 
						
							2023-10-31 19:00:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									D3v1s0m
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0b2bc53b35
								
							
						 | 
						
							
							
								
								hopefully fix build due to api javadoc HTML issue
							
							
							
							
							
						 | 
						
							2023-10-28 10:17:06 +05:30 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pyrbu
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ee37d5436
								
							
						 | 
						
							
							
								
								start on some javadocs
							
							
							
							
							
						 | 
						
							2023-10-28 02:23:17 +02:00 | 
						
						
							
							
							
								
							
							
						 |