diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-01-22 00:14:52 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-01-22 00:20:20 +0800 |
| commit | 140e9148743dbe2469c2c6783f83057aaa2d3565 (patch) | |
| tree | 1844bbe6f800ad1e81b48af54832644c7df0d377 /api/src/main/java/me/shedaniel/rei/impl | |
| parent | e2979ca8bdf49a5db0f944085caec284fde3d00b (diff) | |
| parent | 7dac5856acd5a1b4111f009d3c348a501f1bc397 (diff) | |
| download | RoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.tar.gz RoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.tar.bz2 RoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.zip | |
Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java
# fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java
# forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
Diffstat (limited to 'api/src/main/java/me/shedaniel/rei/impl')
4 files changed, 4 insertions, 4 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java b/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java index 77bba4f8b..d21b59b27 100644 --- a/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java +++ b/api/src/main/java/me/shedaniel/rei/impl/ClientInternals.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/api/src/main/java/me/shedaniel/rei/impl/Internals.java b/api/src/main/java/me/shedaniel/rei/impl/Internals.java index 1e64c2c57..112b030ce 100644 --- a/api/src/main/java/me/shedaniel/rei/impl/Internals.java +++ b/api/src/main/java/me/shedaniel/rei/impl/Internals.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/api/src/main/java/me/shedaniel/rei/impl/common/InternalLogger.java b/api/src/main/java/me/shedaniel/rei/impl/common/InternalLogger.java index 40f81129c..83d88786d 100644 --- a/api/src/main/java/me/shedaniel/rei/impl/common/InternalLogger.java +++ b/api/src/main/java/me/shedaniel/rei/impl/common/InternalLogger.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java b/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java index dbad28245..b9b517f69 100644 --- a/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java +++ b/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal |