Commit graph

4290 commits

Author SHA1 Message Date
IThundxr
d5ef7e5147
Eclipsed
- Modify property expansion to use a method that's compatible with eclipse and running with Intellij instead of Gradle in the build and run with setting
2025-01-09 17:52:55 -05:00
IThundxr
e1ad3c50f7
Looking good
- Update gametest structures
2025-01-09 17:52:54 -05:00
IThundxr
46c0b090fb
Cat++
- Update catnip to fix SbbBuilder
2025-01-08 19:17:15 -05:00
IThundxr
cd78878bd3
Curious curios
- Reimplement support for curios

# Conflicts:
#	gradle.properties
2025-01-07 21:00:48 -05:00
IThundxr
bed0daa529
Run datagen for 1.21.1 2025-01-07 21:00:37 -05:00
IThundxr
15565fab47
Port to 1.21.1
Co-authored-by: TropheusJ <jverrellijr@icloud.com>
Co-authored-by: techno-sam <77073745+techno-sam@users.noreply.github.com>
Co-authored-by: ryanhcode <42245712+ryanhcode@users.noreply.github.com>
2025-01-07 21:00:32 -05:00
IThundxr
4bd47bea41
404 - Cannot be found
- Fix trim texture location
2025-01-07 19:30:37 -05:00
IThundxr
2e7486070e
Flywheel += 2
- Update flywheel
2025-01-07 17:24:34 -05:00
IThundxr
1506570f34
Pondering some catnip
- Update catnip
- Update ponder
2025-01-07 17:21:55 -05:00
IThundxr
2e1627eb34
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-07 16:57:24 -05:00
IThundxr
406ed01864
Gaslight by the loader
- Fix ArmorTrimMixin, lambda names are different in prod for some reason, and are too brittle to even try relying on
2025-01-07 16:57:08 -05:00
Kryppers
4de15f5b67 Copperpocalypse: The final Showdown.
Final textures on to-do list.

First pass on copper roof block-tops.
fixes to stock link, steam engine and display link.
2025-01-07 16:46:05 +00:00
simibubi
20e827ed3f Comedy Gold
- New advancement chain for high logistics
- Fixed top-face filter slot on table cloths
- Fixed players hiding as packages suffocating in a wall
2025-01-07 16:40:10 +01:00
simibubi
d05d10e1e0 Clicks and Dings
- Added sounds for packagers, stock links, requesters and factory gauges
- Added tooltip for factory gauge screen explaining how to add ingredients
2025-01-07 12:31:57 +01:00
IThundxr
187c1bc244
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-06 18:42:09 -05:00
IThundxr
f3926657af
Oh, hello! I recognize you now! 2025-01-06 17:59:41 -05:00
simibubi
c4b38ba32f Needs more sunscreen
- Fixed uv issues on the fluid tank
- Tweaked frogport sounds
2025-01-06 22:57:29 +01:00
IThundxr
81c2975401
Returning your calls
- Remove unused return type in AllArmInteractionPointTypes#register
2025-01-06 16:45:31 -05:00
IThundxr
5db56378fc
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-06 16:28:49 -05:00
IThundxr
1556db1347
Attending event, but not staying for the party 2025-01-06 16:28:37 -05:00
simibubi
3b6b57d9c9 Pack man
- Fixed conveyors erroring on load
- Packagers inserting into inventories now wait a couple of frames before animating
- Packagers activated by signals shorter than 2 seconds will always emit exactly one package
- Added missing shaft detail to the backtank armor
- Different sound type for cardboard and packages
- Stock links are now wrenchable again
2025-01-06 18:05:19 +01:00
simibubi
dda7855aa9 The pain chain
- Fixed chain conveyor chains getting culled while in view
- Chain conveyor riding now updates the player visual instantly after dismount
- Fixed chain conveyor riding animation stopping when too far from the controlling block
- Added sounds for stock keeper and ticker ui
2025-01-06 11:18:08 +01:00
simibubi
e86fd31a7b Out of sight, out of mind
- Stock keeper screen now temporarily fakes item counts after requests until stock info catches up
- Boiler gauge now disappears client-side when blocks are clipping into it
2025-01-05 22:32:16 +01:00
IThundxr
f4e94825d3
Mistaken order 2025-01-05 13:52:33 -05:00
IThundxr
8064cee337
Arts and crafts
- Implement trims support for cardboard armor
2025-01-05 13:37:39 -05:00
IThundxr
9503a809ad
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-05 13:24:23 -05:00
simibubi
61369923e1 Shingle all the ways
- Copper roof blocks now have custom CT behaviour on the top faces. Assets pending
2025-01-05 19:24:24 +01:00
IThundxr
0f3bc10dbd
chore: remove unused config options 2025-01-05 13:24:12 -05:00
IThundxr
72d3fa6991
Arm interaction point and fan processing type registries
- Refactor registration for arm interaction points and fan processing types, they use proper registries now
2025-01-05 13:15:03 -05:00
IThundxr
f405d2bba1
Invisifluids
- Fix gasses not being visible in basins, item drains etc
- Fixes Creators-of-Create/Create#7236
2025-01-05 11:07:48 -05:00
IThundxr
c0e76c28c6
chore(editorconfig): remove fabric specific entries from editorconfig 2025-01-05 10:39:11 -05:00
simibubi
a647f11a6f What does the frog say
- Sound additions and changes for frogports, stock tickers and table cloths
- Fixed trade overlay sprite boundaries
2025-01-05 12:43:13 +01:00
IThundxr
3a9f7d591c
Bugs in the filters 🐛
- Fix crash when using enchant attribute
- Fix gametest
- Add nullcheck before inserting attributes
2025-01-04 22:52:29 -05:00
IThundxr
669435e849
Dimension't
- Remove code trying to restore from .dat_old, not entirely worth it
2025-01-04 22:30:57 -05:00
IThundxr
42fd2826d7
Eager loggers
- Fix trying to restore from .dat_old message being fired if the file isn't present entirely
2025-01-04 22:28:02 -05:00
IThundxr
ec918cd807
Silky smooth configs
- Finer tuning of import order for fabric
2025-01-04 21:59:33 -05:00
IThundxr
abfb8ccc14
For just $10,000 you too can get this state of the art editorconfig 2025-01-04 18:39:38 -05:00
IThundxr
c318366194
The deployers and the fishes
- Fix deployers not placing fish from fish buckets
- Fixes Creators-of-Create/Create#3705
2025-01-04 17:42:57 -05:00
IThundxr
0b3b507491
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-04 17:29:16 -05:00
IThundxr
57d01ce71e
Immortal trains
- Fix /c trains command running the wrong command to remove trains
2025-01-04 17:29:09 -05:00
Kryppers
2a65490fb4 tunnel vision
fixed andesite tunnel mishap
2025-01-04 18:32:03 +00:00
IThundxr
b3dde23fd7
Packed lists
- Fix conditionContext in ScheduleRuntime not getting cleared before new entries are added
2025-01-04 11:23:15 -05:00
Kryppers
3c79a2154c getting there!
further texture tweaks to tablecloths, redstone links and steam engine.
2025-01-04 14:21:05 +00:00
simibubi
d669aa429d Scrolling past
- Adjusted redstone link recipe to andesite tier
- Updated boiler gauge asset
- Updated rope and hose pulley assets/rendering
- Fixed manual table cloth placement being reversed
- Fixed factory gauge screen button positions
2025-01-03 17:55:39 +01:00
Kryppers
c4763fe60a the price(tag) is right
updated textures/models for price tag
2025-01-02 16:58:11 +00:00
IThundxr
d8f6c39620
Heavy contraptions
- Prevent contraptions from activating pressure plates and tripwires
2025-01-02 11:23:36 -05:00
IThundxr
156d0fa837
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-01 22:03:54 -05:00
IThundxr
79fd76155b
Safety boots for SavedData
- Create .dat_old files for SavedData
- Try restoring from the .dat_old if loading from the normal file fails
2025-01-01 22:00:46 -05:00
Kryppers
20197737ab table settings
updated texture for andesite, brass, copper and white tablecloth
2025-01-01 23:48:43 +00:00
Kryppers
dab4b54b44 missed one
small update to portable fluid interface
2024-12-31 17:44:41 +00:00