diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-03 17:23:48 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-03 17:23:48 +0800 |
| commit | 57ef08b02c2692063d8b3c14cc4f5a985c8a5a5e (patch) | |
| tree | c95984dd5343f5cfb788c9d78903418922c01c1a /runtime/src/main/java/me/shedaniel/rei/plugin/client | |
| parent | 3d2b1e760e56ea1ec6ab395d76029e2ae0b1e2d1 (diff) | |
| parent | 2ecc1d1dfe3ffa1261de82fee96d4943a3220bc1 (diff) | |
| download | RoughlyEnoughItems-57ef08b02c2692063d8b3c14cc4f5a985c8a5a5e.tar.gz RoughlyEnoughItems-57ef08b02c2692063d8b3c14cc4f5a985c8a5a5e.tar.bz2 RoughlyEnoughItems-57ef08b02c2692063d8b3c14cc4f5a985c8a5a5e.zip | |
Merge remote-tracking branch 'origin/6.x' into 6.x-1.17
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ContainerScreenOverlay.java
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin/client')
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java index 3d2ba170f..52babf10c 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021 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/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java index 225e7e12a..f26a3d191 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021 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/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java index fd1fec222..557d3bdce 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java @@ -1,6 +1,6 @@ /* * This file is licensed under the MIT License, part of Roughly Enough Items. - * Copyright (c) 2018, 2019, 2020 shedaniel + * Copyright (c) 2018, 2019, 2020, 2021 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 |