Scissors

AtlasMediaGroup/Scissors

Fork 0

mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-06-08 08:23:05 +00:00

Commit Graph

Select branches

Hide Pull Requests

1.17.1

1.18.2

1.19.3

1.19.4

1.20

1.20.1

1.20.2

1.20.4

1.20.6

1.21.4

folia/1.20.1

slime/1.20.1

slime/1.20.2

slime/1.20.4

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#141

#142

#143

#144

#145

#146

#147

#148

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#53

#54

#56

#57

#58

#59

#6

#60

#61

#62

#63

#67

#68

#69

#7

#70

#71

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

archive/1.17.1

archive/1.18.2

archive/1.19.3

archive/1.20

da8e9e0497 I hate Jenkins sometimes Telesphoreo 2022-04-22 03:04:10 -05:00
d495d26d78 the fact that i have to do this to get the branch name is ridiculous Telesphoreo 2022-04-22 02:48:26 -05:00
e3c53a1f8e Try and set the branch name Telesphoreo 2022-04-22 02:42:28 -05:00
67d8415fb3 Add the tasks, this is useful Telesphoreo 2022-04-22 02:07:24 -05:00
cd9edca0e9 Merge https://github.com/PaperMC/paperweight-examples into ver/1.18.2 Telesphoreo 2022-04-22 02:05:48 -05:00
823057089b This is it, all patches applied Telesphoreo 2022-04-22 02:03:09 -05:00
7081efe798 Delete 0020-block-server-side-chunkbans.patch Telesphoreo 2022-04-22 01:35:55 -05:00
042c4d854f Pushing here Telesphoreo 2022-04-22 01:31:04 -05:00
c32bbf0728 Update 0013-Even-more-resource-location-validation.patch Telesphoreo 2022-04-22 01:20:00 -05:00
14d33a5998 Create 0012-Even-more-resource-location-validation.patch Telesphoreo 2022-04-22 01:17:57 -05:00
6884a59cf4 Update 0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch Telesphoreo 2022-04-22 01:15:01 -05:00
d13728a72f Ok get this one in too Telesphoreo 2022-04-22 01:07:51 -05:00
6cf04f68f9 Readd this Telesphoreo 2022-04-22 01:07:06 -05:00
3780ab8142 Create 0004-Fixes-the-Blank-SkullOwner-exploit.patch Telesphoreo 2022-04-22 00:59:19 -05:00
3c9f6d0e01 Update 0018-Fix-negative-death-times.patch Telesphoreo 2022-04-22 00:50:33 -05:00
54c0013982 Update 0019-Update-for-1.18.2.patch Telesphoreo 2022-04-22 00:30:55 -05:00
fba2ddfedc Consolidate more patches Telesphoreo 2022-04-22 00:27:06 -05:00
7b1a66a44e Actually consolidate the build changes into the correct patch Telesphoreo 2022-04-22 00:15:08 -05:00
53755af975 Update Paper Telesphoreo 2022-04-22 00:09:47 -05:00
41be2256f0

Update README Jason Penilla 2022-04-21 20:45:48 -07:00
aedd5067fd

Update upstream Jason Penilla 2022-04-21 20:21:55 -07:00
ef929a72a2 update paper Telesphoreo 2022-04-20 17:19:33 -05:00
81609b1d4b Actually fix updater Telesphoreo 2022-04-19 20:09:38 -05:00
65407daeae Delete 0023-Revert-and-fix-a-few-things.patch Telesphoreo 2022-04-19 20:05:39 -05:00
719cce7443 Create 0023-Revert-and-fix-a-few-things.patch Telesphoreo 2022-04-19 20:02:28 -05:00
1546e4ae5f Update Jenkinsfile Telesphoreo 2022-04-19 19:38:51 -05:00
2671eeee6b Attempt to fix updater Telesphoreo 2022-04-19 19:35:55 -05:00
a988bca4a6 try and fix it again Telesphoreo 2022-04-19 19:22:46 -05:00
b76c7d1ccd Create 0021-Fix-versioning.patch Telesphoreo 2022-04-19 19:15:50 -05:00
856ff4c719 It compiles, that's all I guarantee Telesphoreo 2022-04-19 19:05:57 -05:00
4c0a4b8804 I'm committing this right now. I don't know if it works but it compiles Telesphoreo 2022-04-19 18:49:48 -05:00
243ebd8d3b changes i think Telesphoreo 2022-04-19 18:21:18 -05:00
011c000a26

Merge pull request #12 from allinkdev/deathtimes ayunami2000 2022-04-19 07:47:25 -04:00
39916e2102

Fix negative death times Business Goose 2022-04-19 11:56:30 +01:00
c2618f2522

Reset large tags (#11) Allink 2022-04-19 00:20:08 +01:00
d120903a36 Get branch for version checking automatically Telesphoreo 2022-04-18 17:23:52 -05:00
2aa83ebb1f Don't clean the workspace first Telesphoreo 2022-04-14 20:40:24 -05:00
195650a11b Add tests Telesphoreo 2022-04-14 20:32:26 -05:00
5be5c364cd Update Paper Telesphoreo 2022-04-14 20:07:20 -05:00
42ce42b668 Fixes creative-killing potion effects and certain potion effect overflows Video 2022-04-11 13:38:34 -06:00
96c05b397e Attempt to speed up compilation process Telesphoreo 2022-04-11 01:39:25 -05:00
ec3e517057 Merge branch 'main' of https://github.com/AtlasMediaGroup/Scissors Telesphoreo 2022-04-10 16:58:57 -05:00
d7ba16b712 I think this is what we want Telesphoreo 2022-04-10 16:58:49 -05:00
a9cc494a94 Backport patch 888 from the regular Paper Video 2022-04-10 15:58:40 -06:00
66efa217d0 Update Jenkinsfile Telesphoreo 2022-04-10 16:54:42 -05:00
d4a73a9b3f

Limit ListTags to 1024 elements (#9) Luna 2022-04-09 21:06:20 -03:00
ecfd11a180 Don't query NBT from players in the nbt text component Video 2022-04-09 13:02:56 -06:00
3fca938ad8 Separate the steps for better visualization Telesphoreo 2022-04-07 16:07:56 -05:00
3feb510c17 Use Gradle wrapper Telesphoreo 2022-04-07 00:05:56 -05:00
ac5ee6b0d7 Update Jenkinsfile Telesphoreo 2022-04-06 21:45:16 -05:00
c9ea15b233 Almost forgor Telesphoreo 2022-04-04 17:32:55 -05:00
65c6dc2d62 Let's try something Telesphoreo 2022-04-04 17:21:20 -05:00
646f5e6002

Prevent non-living entities from being spawned by spawners (#7) Allink 2022-04-04 09:39:28 +01:00
6760ad5417 Properly renames patch #19 to stop it from renaming itself Video 2022-04-04 02:13:12 -06:00
864f0915fd Remove API patches Telesphoreo 2022-03-31 15:26:41 -05:00
6950f39d8c Prevent attributes with invalid namespaces from being applied to CraftMetaItems Video 2022-03-30 18:24:02 -06:00
8fdf4dce39 Validate String UUIDs during the CompoundTag -> GameProfile conversion process Video 2022-03-30 02:04:27 -06:00
4cecc52099 Reject oversized components from updating + removes unnecessary imports from dev-imports.txt Video 2022-03-28 17:13:43 -06:00
50e5b29c3d

Merge pull request #6 from AtlasMediaGroup/FS-176 ayunami2000 2022-03-28 17:30:11 -04:00
31aad362c1 prepare for pr + fix typo ayunami2000 2022-03-28 17:24:47 -04:00
77cc5f291f Better handling of invalid JSON components Video 2022-03-28 15:17:49 -06:00
dbfbd9bca9 patch server side chunkbans ayunami2000 2022-03-28 17:07:28 -04:00
83cbb45e49 Attempt to fix security warnings Telesphoreo 2022-03-26 23:25:45 -05:00
c2447a2967 Delete 0001-Add-getCommit-method-to-Bukkit.patch Telesphoreo 2022-03-26 23:24:28 -05:00
a9ff8bbf56 This time it really works, trust me Telesphoreo 2022-03-26 22:57:15 -05:00
b633a0b588 Force the exception so we do use Git Telesphoreo 2022-03-26 22:34:10 -05:00
c50ed524ed Don't rely on Jenkins / Paper API Telesphoreo 2022-03-26 22:13:07 -05:00
5ecc13f8e7 Create 0017-Change-version-fetcher-to-AMG.patch Telesphoreo 2022-03-26 22:00:15 -05:00
148c864c28 Add NBT to dev imports Telesphoreo 2022-03-26 21:28:15 -05:00
cd6898a9b0

Update README.md Telesphoreo 2022-03-23 23:54:11 -05:00
de72c29550

Merge pull request #5 from LunaWasFlaggedAgain/main Paldiu 2022-03-22 03:59:58 -05:00
d929190ea2 I'm fucking retarded Video 2022-03-20 11:40:17 -06:00
0afb6fef8d

Merge branch 'AtlasMediaGroup:main' into main Luna 2022-03-20 13:43:40 -03:00
330a8ac936

t Luna 2022-03-20 13:43:35 -03:00
dcef1afe08 A better solution Video 2022-03-20 08:38:11 -06:00
72b2109450 Validate coordinates before attempting to get block entities when handling Creative Inventory packets Video 2022-03-20 07:49:57 -06:00
1a748f754c Downgrades Paperclip to 2.0.1 Video 2022-03-20 06:32:37 -06:00
57b96d20af Do not log invalid items in HoverEvent and ItemFrame Luna 2022-03-20 09:31:54 -03:00
ca57c181e4 Fixes crash exploit related to out of bounds Axolotl variants Video 2022-03-20 04:41:32 -06:00
529a33f1be Even more ResourceLocation validation and log spam fixes Video 2022-03-20 04:21:47 -06:00
2b36e3b591 Even more resource location validation Video 2022-03-14 00:52:57 -06:00
bca07e92bc Validates BlockState and SoundEvent values Video 2022-03-13 22:07:59 -06:00
9639d51c31 Additional fixes related to Knowledge Books Video 2022-03-13 21:12:08 -06:00
61cce5a83c Fixes Knowledge Books causing log spam when invalid data is provided Video 2022-03-13 18:47:15 -06:00
ac6b6f77ee

Merge pull request #4 from LunaWasFlaggedAgain/main Video 2022-03-13 18:28:17 -06:00
128fa39f5a ItemEntity - Check if items are air before calling setItem Luna 2022-03-13 14:39:58 -03:00
82c566c108 Ignore errors thrown when trying to remove minecart entities with content in them Video 2022-03-13 08:16:59 -06:00
844df73f12

Merge pull request #3 from LunaWasFlaggedAgain/main Video 2022-03-13 08:11:55 -06:00
cc3776b0b4 Ignore null/air bundle items in CraftMetaBundle Luna 2022-03-13 11:08:25 -03:00
28312aba85 Removes useless spammy error logging Video 2022-03-13 08:00:06 -06:00
347ea8905c Fixes invalid LootTables causing problems when applied to Minecart entities Video 2022-03-13 07:43:47 -06:00
eabbb65766 Fixes log spam caused by invalid entities in beehives Video 2022-03-13 06:12:45 -06:00
97d0a98f49 The project now builds properly Video 2022-03-13 04:52:24 -06:00
8de4abc61b Fixes the Blank SkullOwner exploit Video 2022-03-13 04:49:46 -06:00
3def4e2324

Merge pull request #2 from AtlasMediaGroup/invalid-hover-uuid Video 2022-03-13 00:27:37 -07:00
b9f5db4717 Return null when a show_entity hover event's UUID isn't valid Video 2022-03-12 20:27:30 -07:00
b8f1e68869

Merge pull request #1 from LunaWasFlaggedAgain/main Video 2022-03-12 18:50:40 -07:00
49f7f4f21d Downgrade to 1.17.1 + Rebrand Luna 2022-03-12 22:39:38 -03:00
90efbbe385

Update gradle plugins and remapper Jason Penilla 2022-01-27 13:24:04 -07:00
c197882df1

update paperweight, gradle wrapper, and shadow Jason Penilla 2021-12-23 19:56:45 -08:00