Scissors

AtlasMediaGroup/Scissors

Fork 0

mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-26 22:55:39 +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

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

437e40a2f8 Update Paper Telesphoreo 2023-11-04 21:46:48 -0500
5e8dbab98c Update Paper Telesphoreo 2023-11-04 21:36:47 -0500
9e874fb21f Update 0001-AdvancedSlimePaper-Server-Changes.patch Telesphoreo 2023-10-29 23:40:57 -0500
0ef1c4d8a8 Update Paper Telesphoreo 2023-10-29 23:23:41 -0500
cbd4b8c045

Update Paper Telesphoreo 2023-10-29 15:36:20 -0500
27e30f29d6

Update Paper Telesphoreo 2023-10-23 20:31:00 -0500
291a7fa852

Update Paper Telesphoreo 2023-10-23 20:25:24 -0500
1283dcdd4c Update Paper Telesphoreo 2023-10-22 21:24:14 -0500
ba578b3eec Update Paper Telesphoreo 2023-10-22 21:14:50 -0500
7d9b628fac Update Paper Telesphoreo 2023-10-21 16:48:43 -0500
9d91c55259 Add compiling instructions for Windows and update Metrics slime/1.20.1 Telesphoreo 2023-10-20 22:50:29 -0500
6b3e59b039 oops Telesphoreo 2023-10-20 22:47:01 -0500
acfd3e1814 Revise compiling instructions Telesphoreo 2023-10-20 22:45:56 -0500
e393f9b057 Add compiling instructions for Windows and update Metrics class Telesphoreo 2023-10-20 22:36:42 -0500
7ceedf9453

Update 0001-AdvancedSlimePaper-Server-Changes.patch Telesphoreo 2023-10-19 19:16:53 -0500
574452466d update urls Telesphoreo 2023-10-19 02:54:47 -0500
a394fb44d8 Update 0002-Build-changes.patch Telesphoreo 2023-10-19 02:26:39 -0500
763df5c337 Update AdvancedSlimePaper Telesphoreo 2023-10-19 02:15:30 -0500
f70596845b oops Telesphoreo 2023-10-19 02:05:14 -0500
58a5036119 changes Telesphoreo 2023-10-19 02:03:56 -0500
e0f91f7178 Fix ASWM server patch Telesphoreo 2023-10-19 00:03:42 -0500
c9e9ae9573 Begin work on slime 1.20.2 Telesphoreo 2023-10-18 17:49:54 -0500
66f40c0905 Update Paper Telesphoreo 2023-10-17 23:24:46 -0500
343f0b78b2

Patches from Luna (#144) Telesphoreo 2023-10-15 17:45:13 -0500
5e16a962c3

Merge branch '1.20.2' into luna-patches Telesphoreo 2023-10-15 17:45:06 -0500
f7e1e35ffc

Update README links Telesphoreo 2023-10-15 16:09:50 -0500
00f8298fed Patches from Luna Telesphoreo 2023-10-15 16:05:33 -0500
367d03e949

Update Paper Telesphoreo 2023-10-15 08:01:09 -0500
c5f38c235c

Update Paper Telesphoreo 2023-10-12 11:34:50 -0500
f15dbbc6d3 Update Paper Telesphoreo 2023-10-10 22:51:12 -0500
8fc04a818b Update Paper and add javadocs back Telesphoreo 2023-10-06 18:20:04 -0500
1050894e5a Update Paper and fix compilation errors (again) Telesphoreo 2023-10-06 02:32:03 -0500
c268904a94 Add patch limiting map decorations back (untested) Telesphoreo 2023-09-30 18:45:42 -0500
d3cf82a23f Fix compilation issue and update Paper Telesphoreo 2023-09-30 17:05:14 -0500
3a1a4b68b9 Update Paper Telesphoreo 2023-09-27 15:45:02 -0500
f3bd200608

remove patch as it still doesnt build for some reason Telesphoreo 2023-09-25 19:12:52 -0500
227341fc66

Add back a patch Telesphoreo 2023-09-25 19:06:18 -0500
0e2564c3fa

Rebuild patches Telesphoreo 2023-09-24 17:01:28 -0500
ccc2be8000

everything that went in cleanly Telesphoreo 2023-09-24 16:58:36 -0500
cc6f512333

More patches Telesphoreo 2023-09-24 16:42:28 -0500
37e93142a5

some more patches Telesphoreo 2023-09-24 16:03:31 -0500
5a93f07bd7

tests are broken for some reason Telesphoreo 2023-09-24 15:47:17 -0500
cd87d4fc61

ResourceLocation validation Telesphoreo 2023-09-24 15:29:45 -0500
5cbac48e6f

Begin very basic work on 1.20.2 Telesphoreo 2023-09-24 15:13:43 -0500
3ce7bbf9ca Merge branch '1.20.1' of https://github.com/AtlasMediaGroup/Scissors into slime/1.20.1 Telesphoreo 2023-09-23 14:26:13 -0500
9bb6c35edd

Fix Jenkins (#143) 1.20.1 Telesphoreo 2023-09-23 14:19:20 -0500
1658b50a44 Update Jenkinsfile Telesphoreo 2023-09-23 14:12:22 -0500
7d86fb8c0f Update build.gradle.kts Telesphoreo 2023-09-23 14:11:44 -0500
0e06333848 try this Telesphoreo 2023-09-23 14:07:37 -0500
a4214a489d

can github build it Telesphoreo 2023-09-23 13:38:40 -0500
065576c8b2 Update Jenkinsfile Telesphoreo 2023-09-23 13:32:10 -0500
aa957c1777 Update Jenkinsfile Telesphoreo 2023-09-23 13:17:42 -0500
f8f680cbf7 attempting more fixes Telesphoreo 2023-09-23 13:12:54 -0500
c1be123c27 Update build.gradle.kts Telesphoreo 2023-09-23 13:12:08 -0500
3acfa3fa80 Rebuild patches Telesphoreo 2023-09-23 12:46:35 -0500
f8898d0e1c Update AdvancedSlimePaper Telesphoreo 2023-09-23 12:40:43 -0500
d5b68d8f5c Merge branch '1.20.1' of https://github.com/AtlasMediaGroup/Scissors into slime/1.20.1 Telesphoreo 2023-09-23 12:38:22 -0500
35fd7b6fc0 Update Paper Telesphoreo 2023-09-23 12:36:55 -0500
ddd6e20790

Update Paper Telesphoreo 2023-09-20 17:58:00 -0500
7cec3d6681 Update Folia folia/1.20.1 Telesphoreo 2023-09-12 20:54:55 -0500
fb3550ad44 Update Paper Telesphoreo 2023-09-12 18:28:31 -0500
71a75afe98 Update Paper Telesphoreo 2023-09-12 18:09:19 -0500
612fc104c3

Update Paper Telesphoreo 2023-09-07 11:38:25 -0500
378d710612

Update Paper Telesphoreo 2023-09-07 11:26:06 -0500
a40d598ab1 Update ASP Telesphoreo 2023-08-30 19:19:11 -0500
182525b22b Rebuild patches Telesphoreo 2023-08-30 18:59:11 -0500
a5af796395 Merge branch '1.20.1' of https://github.com/AtlasMediaGroup/Scissors into slime/1.20.1 Telesphoreo 2023-08-30 18:55:35 -0500
a07a38484b Update Paper Telesphoreo 2023-08-30 18:54:39 -0500
30b69bc059

Merge branch 'slime/1.20.1' of https://github.com/AtlasMediaGroup/Scissors into slime/1.20.1 Telesphoreo 2023-08-26 18:39:16 -0500
9fc9c36cb3

Update Paper Telesphoreo 2023-08-26 18:29:50 -0500
b2bc2c2152

Update Jenkinsfile Telesphoreo 2023-08-23 16:44:58 -0500
c39661c11a

Update Jenkinsfile Telesphoreo 2023-08-23 16:43:37 -0500
dc0a3610ec

try this Telesphoreo 2023-08-23 16:37:40 -0500
185c5ee1a6

Update Jenkinsfile Telesphoreo 2023-08-23 16:35:23 -0500
76822727f6

Jenkins fix (#139) Telesphoreo 2023-08-22 23:07:02 -0500
511733b8d5

Fix Github actions (#138) Luna 2023-08-22 22:11:53 -0300
40a91ca05e

Slime (#136) Luna 2023-08-22 21:15:48 -0300
ff6a9c5ff6

Update Paper Telesphoreo 2023-08-26 18:29:50 -0500
4d3359cb97

Update Paper Telesphoreo 2023-08-26 18:16:09 -0500
8226a3b03a

Update slime branch (#142) Taahh 2023-08-26 06:38:40 -0700
e82a295608

Add length limit to note block sound (#141) allinkdev 2023-08-25 15:59:50 +0100
5a035a23a2

Add length limit to note block sound Allink 2023-08-25 11:59:30 +0100
d6432c162f Update Paper Telesphoreo 2023-08-24 16:35:32 -0500
5a7aef059d Update Paper Telesphoreo 2023-08-24 16:21:12 -0500
79705ff262

Update Jenkinsfile Telesphoreo 2023-08-23 16:44:58 -0500
d013cfde88

Update Jenkinsfile Telesphoreo 2023-08-23 16:43:37 -0500
1bbbb18b2e

try this Telesphoreo 2023-08-23 16:37:40 -0500
8bc2c95edb

Update Jenkinsfile Telesphoreo 2023-08-23 16:35:23 -0500
cbd52d38d9

Jenkins fix (#139) Telesphoreo 2023-08-22 23:07:02 -0500
c569642bd5

Update Jenkinsfile Telesphoreo 2023-08-22 21:28:37 -0500
af299391fc

Update Jenkinsfile Telesphoreo 2023-08-22 21:27:36 -0500
8f2be500b5

Fix Github actions (#138) Luna 2023-08-22 22:11:53 -0300
dc062eafbb Fix Github actions Luna 2023-08-22 21:36:57 -0300
e2427f3613

Folia (#137) Luna 2023-08-22 21:24:44 -0300
5fbba7cbfb Merge remote-tracking branch 'upstream/1.20.1' into folia/1.20.1 Luna 2023-08-22 21:22:21 -0300
3f889f5040

Slime (#136) Luna 2023-08-22 21:15:48 -0300
26dc35bc15 Merge remote-tracking branch 'upstream/1.20.1' into slime/1.20.1 Luna 2023-08-22 18:49:01 -0300
e8dbeb27e9 Update Paper Telesphoreo 2023-08-22 15:45:16 -0500
9ef3f3e3a2 Cleanup Luna 2023-08-21 21:30:31 -0300
e55173120b

Add proper credits. Thanks ASP! Luna 2023-08-21 20:46:13 -0300