Commit graph

4814 commits

Author SHA1 Message Date
IThundxr
e0f7030d46
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	build.gradle
#	gradle.properties
2025-03-02 13:57:26 -05:00
IThundxr
bc335ddc0d
Opposite day
- Strict actually means "Bundle anything between that range, and preferably the newest"
2025-03-02 13:55:32 -05:00
simibubi
aef84d068c Rug pulled
- Fixed Shopping lists disappearing when clicking a different table cloth #7548
2025-03-02 19:32:36 +01:00
IThundxr
5448df7d09
Empty tanks 2025-03-02 12:44:20 -05:00
IThundxr
689d6ed4f1
Publish slim jar 2025-03-02 10:59:32 -05:00
IThundxr
1f306c3dc9
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	src/main/java/com/simibubi/create/AllDisplaySources.java
2025-03-02 10:17:44 -05:00
IThundxr
5d9e13d43d
Knowledgable books
- Fix crash when using LecternDisplayTarget
2025-03-02 10:15:40 -05:00
IThundxr
179e6c141e
Missing computers
- Fix warning getting logged when cc: tweaked isn't installed
- update changelog
2025-03-02 08:23:40 -05:00
IThundxr
dacf3e1628
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev 2025-03-02 08:05:00 -05:00
IThundxr
77066b8971
Fix publishing version & re-enable cf publishing 2025-03-02 08:04:33 -05:00
IThundxr
20c3f6ca8c
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev 2025-03-02 07:51:41 -05:00
IThundxr
2d5770a453
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev 2025-03-02 07:51:09 -05:00
IThundxr
45f913d07c
update wrapper validation 2025-03-02 07:51:01 -05:00
simibubi
5ea2bffb91 Merge branch 'mc1.20.1/dev' into mc1.21.1/dev 2025-03-02 13:32:01 +01:00
simibubi
2de5634642 Update changelog.md 2025-03-02 13:30:58 +01:00
simibubi
2f7aa76a92 Stocks crashing
- Fixed crash when modifying pipe structures while they are transporting fluids #7515
- Fixed shift-inserting into toolboxes causing items to be voided #7519
- Fixed inconsistent component serialisation in backtank BE
- Fixed table cloths not showing tooltips and enchantment effect when configured
- Fixed shopping list tooltip expanding as its viewed #7503
- Fixed crash when selling enchanted items on a table cloth #7516 #7536
2025-03-02 13:28:44 +01:00
simibubi
e5e2708c66 Port new changes 2025-03-02 12:24:29 +01:00
simibubi
d3c8718ba9 Merge branch 'mc1.20.1/dev' into mc1.21.1/dev 2025-03-02 12:01:12 +01:00
simibubi
9f2e506e16
Merge pull request #7428 from Creators-of-Create/l10n_crowdin_translations
New Crowdin translations
2025-03-02 11:51:16 +01:00
simibubi
e0ab2796bd Patch Production II
- Fixed crash when shift-clicking items in the package filter UI #7497
- Fixed crash caused by the create menu button when loaded too early #7521
- Safety check for fan processing type view crashing #7499 (Might be a concurrency issue, maybe investigate this further)
2025-03-02 11:49:58 +01:00
Crowdin Bot
70355cce8a New Crowdin translations by Github Action 2025-03-02 09:20:45 +00:00
Jozufozu
91b6072f21 Canonical wheel
- Bump flywheel version
2025-03-01 22:55:03 -08:00
IThundxr
7946a0b591
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev 2025-03-01 21:13:33 -05:00
TropheusJ
cda89da9ca better fix for InventorySorter compat 2025-03-01 19:55:49 -05:00
simibubi
50798ab86b Update changelog.md 2025-03-02 00:24:11 +01:00
IThundxr
6d464d61d7
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java
2025-03-01 18:03:03 -05:00
IThundxr
b7eb951c20
Packed registries 2025-03-01 18:00:30 -05:00
simibubi
c9534c92d0 Frog and Shop Flops
- Fixed Shopping lists not syncing with clients when adding purchases #7449 #7393
- Fixed Frogport ponder scene not animating
- Fixed broken address filter in second stock ticker ponder scene
2025-03-01 23:28:32 +01:00
simibubi
a088b5b258 Patch production
- Remove killtps command, it should not be available in built jars
- Added a tooltip for the stock keeper address input
- Fixed crash when re-packaging a duplicated package fragment #7456
- Fixed crash when ctrl-click copying a gauge #7431
- Safety check for unexpected string modifications in address edit boxes #7409
2025-03-01 22:00:19 +01:00
IThundxr
8539481a85
Completely Fluid
- Fix crash with fluid propagator
2025-03-01 15:58:38 -05:00
IThundxr
5734f4b119
Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
#	build.gradle
#	gradle.properties
#	src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java
#	src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
#	src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java
#	src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java
#	src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java
#	src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java
#	src/main/java/com/simibubi/create/content/trains/entity/ArrivalSoundQueue.java
#	src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java
#	src/main/resources/META-INF/mods.toml
2025-03-01 15:53:53 -05:00
IThundxr
93f268419b
Fix heavy boots 2025-03-01 15:22:07 -05:00
IThundxr
c5d9e06779
Slim jars III 2025-03-01 14:45:30 -05:00
IThundxr
bb39ed0fba
Slim jars II 2025-03-01 14:34:55 -05:00
IThundxr
b3cf357dbb
Slim jars 2025-03-01 14:06:37 -05:00
IThundxr
4dcdc6c373
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/dev
# Conflicts:
#	gradle.properties
2025-03-01 14:02:25 -05:00
IThundxr
da87ecb952
Chaotic day
- Publish slim jars
- Allow cardboard swords to damage other arthropods
- Update flywheel
- Fix players getting forced into swim mode when using diving boots
- Fix crash with re-packagers and stock links
- Optional dep updates
2025-03-01 14:01:18 -05:00
IThundxr
4ec1bd1114
The bugs escaped the box II
- Run datagen
2025-03-01 09:08:06 -05:00
IThundxr
427105d4fc
The bugs escaped the box
- Fix item group attribute crashing
- Fix mixin conflict with imm portals
- Fix processing output not supporting components
- Run datagen
2025-03-01 09:00:10 -05:00
IThundxr
a89b582ae3
Morning fixes
- Fix upload task not uploading the reobf'd jar
- Fix debug info not translating the graphics mode text
- Fix crash with factory gauges
- Mark getQueuedPromises as @Nullable
2025-03-01 07:54:34 -05:00
IThundxr
8e002e49fa
fix artifact name 2025-02-28 21:35:49 -05:00
IThundxr
6019e17a8b
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev 2025-02-28 21:27:51 -05:00
IThundxr
e431324f98
Fix publishing to maven 2025-02-28 21:27:18 -05:00
IThundxr
c0a1e022ee
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev 2025-02-28 19:35:51 -05:00
IThundxr
6f6072dbd0
undo jenkins changes 2025-02-28 19:35:36 -05:00
IThundxr
cb17d887bb
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	build.gradle
2025-02-28 19:26:10 -05:00
IThundxr
2e40bb296c
Temp disable 2025-02-28 19:25:15 -05:00
IThundxr
eccf2de123
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
2025-02-28 19:21:14 -05:00
IThundxr
783bc714b2
Update jenkins file 2025-02-28 19:20:17 -05:00
IThundxr
d292d36200
fix workflow 2025-02-28 19:10:07 -05:00