mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-15 23:14:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,784 Commits 31 Branches 14 Tags 106 MiB
ca4ca11232
Commit Graph

1681 Commits

Author SHA1 Message Date
zelophed
01e5b812c2 changing the server 2021-04-15 15:44:26 +02:00
simibubi
f9d48386ca Scanning the Far Lands for Rails 
- Fixed basins not continuing their processing when items are extracted by funnel #1416
- Basins now accept full stacks for items thrown into the top manually
- Fixed Smart Chutes not dropping filter items
- Fixed Smart Chutes not updating attached diagonal chutes properly when removed
- Fixed Server-side crash when coupling two minecarts from a glitched self-colliding pile
 2021-04-15 14:43:34 +02:00
simibubi
2fc26f1112 Defer. Everything. 
- Millstone now accepts items from belts/ejectors directly
- Fixed Redstone-triggered components losing tile data after moved by a Contraption
- Super glue between non-solids can now be removed while the glue item is equipped
- Fixed Deployers not able to interact with glued blocks
- Fixed incorrect lang mapping of UI button descriptions
- Placement assist block preview now lights properly, doesn't z-fight and fades in gradually
- Pickaxe and Axe are now effective on piston extension poles
- Fixed block breaking animations inside the ponder UI
- Fixed Ponder Scenes rendering on top of the progress bar
- Fixed Mechanical Press not retracting when items were removed early
- Fixed Windmill Bearings allowing to be moved while assembled
- Mechanical Pistons now silence the "missing poles" error after poles were added
 2021-04-15 05:19:15 +02:00
simibubi
13f0823ccb Sound Registry Refactor 
- Improved registration and datagen for custom and combined sounds
 2021-04-14 23:40:42 +02:00
zelophed
fdbdf0ec8d completing the set 2021-04-14 03:27:11 +02:00
zelophed
bb8153f140 texting numbers 2021-04-13 23:54:26 +02:00
simibubi
e92e9a7139 Bad impression 
- Mechanical Press can no longer create sheets in bulk, unless configured to
- Fixed Mechanical Press missing items passing on a belt while retracting
 2021-04-11 15:24:58 +02:00
zelophed
5b04e82163 boolean toggle 2021-04-11 03:12:43 +02:00
simibubi
d249318b80 Pose stack says no 
- TileEntities not appreciative of wrapped worlds are now much less likely to cause a hard crash
 2021-04-11 02:56:11 +02:00
zelophed
3de3de89db finally some content 2021-04-10 20:00:32 +02:00
simibubi
976be3470f Better address these, Part II 
- Fixed entities attempting to path-find through Creates' non-solids #1390
- Fixed Redstone Links occasionally wiping their frequency when moved in a Contraption
- Fixed Flywheels doubling their SU capacity after every chunk reload
- Fixed display of numeric formats using non-breaking space #1374
- Signs can now be moved on a contraption #1315
- Fixed Typo in german localization #1363
- Fixed Windmill Bearings keeping su information after relocation #1364
- Fixed Symmetry Wand using up too many items #1342
 2021-04-10 18:23:42 +02:00
simibubi
9ee42c1824 Wrapped Hints 
- Fixed goggle tooltips flipping to the left when too wide
- Can no longer drag the goggle overlay off-screen in the config ui
 2021-04-10 03:49:41 +02:00
simibubi
5de2e1ea9d Ghostbusters 
- Patched up yet another set of entry points to kinetic source loops
 2021-04-10 03:26:38 +02:00
simibubi
939c640e14 Better address these 
- Fixed Nixies rendering inconsistently
- Fixed belts not showing items under certain conditions
- Fixed vertical/sideways belts accepting items from other belts
- Spouts can now interact with belts/depots with a mounted funnel
 2021-04-10 01:50:13 +02:00
JozsefA
cbb7e48565 Revert "Don't crash with starlight" 
This reverts commit 4ae1ce3d
 2021-04-09 16:21:38 -07:00
JozsefA
536b8d2d5e Fix transparent contraption parts rendering strangely 
- It was rendering as if it existed with your hand.
 2021-04-09 15:23:51 -07:00
JozsefA
f2c6afdcb3 Fix projection matrix bug 
- Copy the projection matrix when vanilla would be uploading it to GL.
 - This should account for just about everything.

Unrelated to the fix:
 - Shader programs now have more flexibility in specialization.
 - Accomplished with IMultiProgram.
 - Remove unnecessary SHADER_DEBUG_OUTPUT boolean.
 2021-04-09 14:48:44 -07:00
simibubi
edb1b59f41 Housekeeping 
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
 2021-04-08 19:22:11 +02:00
zelophed
f9179b3b1d animated colors 2021-04-07 18:47:19 +02:00
zelophed
b1773e9e6b shadow cog 2021-04-07 15:18:37 +02:00
grimmauld
b10203db01 Extract block breaking in TreeCutter.Tree to AbstractBlockBreakQueue for better reusability and option of saw passing a different item 2021-04-07 15:13:07 +02:00
grimmauld
ac8c1e1468 Fixed unported stuff, tree cutter now does sound effects at the right probability again 2021-04-07 14:29:41 +02:00
grimmauld
2613c5be89 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-04-07 14:07:13 +02:00
grimmauld
f19c6ab763 - Deforester now hits forge hooks for tool break, block break, times used. 
-Moved deforester not loosing durability from leaves to DeforesterItem instead of Tree mining
- added destroyBlocks method in TreeCutter$Tree for less doubled code
- Mechanical Saws currently break the tree with an empty "hand" as they did before
- Silktouch and Fortune enchants are now being applied from deforesters
 2021-04-07 14:07:06 +02:00
simibubi
525001e410 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-07 12:36:39 +02:00
simibubi
ffa19dd354 Update data, move misplaced localization file 2021-04-07 12:00:00 +02:00
simibubi
c46e286844
Update Localization Readme.txt 2021-04-07 11:38:11 +02:00
simibubi
1bc32d4b80
Merge pull request #1355 from Peatral/mc1.15/dev 
Update de_de.json
 2021-04-07 11:29:30 +02:00
JozsefA
f2b064fa49 Instanced rope pulleys 
- The "magnet" texture is broken
 2021-04-06 23:17:16 -07:00
zelophed
7ad0575618 fancy text 2021-04-07 02:17:55 +02:00
JozsefA
4b49763e0c Got a weird crash profiling the slideshow machine 
- Seems to be a race condition, try/catch should be good enough
 2021-04-06 16:52:34 -07:00
JozsefA
40bdbc7048 Instanced rope pulleys 2021-04-06 16:46:24 -07:00
JozsefA
3a52fa573f Merge branch 'mc1.15/dev' into mc1.15/pulley-instance 2021-04-05 23:44:27 -07:00
JozsefA
7a1445f00a Fix nullpointer with starlight 2021-04-05 23:43:39 -07:00
JozsefA
4ae1ce3dbe Don't crash with starlight 2021-04-05 23:23:35 -07:00
zelophed
d4994ddc8b entry point 2021-04-06 00:05:29 +02:00
Christof
cbabd943fd Typo 
Whoops
 2021-04-05 16:39:03 +02:00
Christof
330777045e Update de_de.json 
Added missing blocks and GUI stuff and fixed typos.
Now only
  - Most advancements
  - A lot of block summaries/tooltips
  - All of the pondering
  - All attributes
are missing
 2021-04-05 16:15:00 +02:00
JozsefA
3b05e06d35 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-03 18:45:23 -07:00
JozsefA
c55351e980 Fix nullpointer with starlight 2021-04-03 18:33:47 -07:00
simibubi
19020b39bf Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 01:53:50 +02:00
simibubi
3da35a30e3 Version up 2021-04-04 01:52:55 +02:00
simibubi
9dc528d96c Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 01:30:18 +02:00
simibubi
b05a03d417 Update NixieTubeBlock.java 
- Revert rushed solution to auto nixie control
 2021-04-04 01:30:01 +02:00
simibubi
307241e7fd Port new Changes 2021-04-04 00:58:23 +02:00
simibubi
47bd1d9c93 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 00:58:14 +02:00
zelophed
e8338d4805 too much backtracking 2021-04-04 00:36:31 +02:00
JozsefA
9d99a5f968 Compromise for render bounding box caching 
- Recalculating it once per tick is better than doing it every frame.
 - Only ever doing it once has proven unreliable.
 2021-04-03 15:08:06 -07:00
simibubi
62b1fe82b7 Fix-ups Cont'd 
- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
 2021-04-03 23:49:59 +02:00
JozsefA
ba91eaa4ef Probably fix ghost hands appearing by the player 2021-04-03 14:23:00 -07:00
simibubi
b845809b58 The great Escape 
- Adresses #1324
 2021-04-03 19:50:42 +02:00
simibubi
69c3a57c76 Quell the outrage! 
- Placement indicator arrow is slightly smaller by default
 2021-04-03 19:46:26 +02:00
simibubi
d1c8ad38fc Chute extraction refactor 2021-04-03 19:41:33 +02:00
simibubi
9ab5c74929
Merge pull request #1340 from sarim/mc1.15/dev 
allow smart chute to transfer whole stacks
 2021-04-03 19:31:16 +02:00
simibubi
1fd6b4360c Performant fictional entities 
- Fixed crash with the Performant mod when entities are present in a ponder scene
 2021-04-03 19:30:38 +02:00
simibubi
83e7074f12 Hot Fix-ups 
- Change to proper key handling for closing create screens
- Fixed inconsistent collection behaviour of in-world funnels
 2021-04-03 18:59:10 +02:00
simibubi
f528520a53 Destructive Pondering 
- Fixed a couple overlooked ponder lang issues
- Fixed weighted ejector not accepting arbitrary gold plates in its recipe
- Fix crash opening ponder from screens with an opened recipe book
 2021-04-03 18:33:48 +02:00
simibubi
747849d52e Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-04-03 17:55:08 +02:00
simibubi
72789caa01 0/10 not ported 
- Fixed text wrapping on ponder text elements
 2021-04-03 17:55:06 +02:00
Sarim Khan
463854a2c0
allow smart chute to transfer whole stacks 2021-04-03 21:53:39 +06:00
JozsefA
75f2516408 Hopefully fix ServerWorld class cast exception 
- Avoid changing Entity.world, maintain contraption related state in the mixin.
 - Add a mixin to playSound to shift the position of the sound.
 2021-04-03 00:42:21 -07:00
zelophed
809bc6bf88 merge and port 2021-04-03 01:16:14 +02:00
zelophed
e05eb5c386 Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/config/CClient.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
 2021-04-03 01:00:57 +02:00
zelophed
7a6b1c6949 0.3.1 hotfixes, part I 2021-04-03 00:54:28 +02:00
JozsefA
5abc1e0fe7 Instanced pulleys first pass 2021-04-02 13:38:28 -07:00
simibubi
c7a3464151 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-02 22:27:37 +02:00
zelophed
19862d4341 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-04-02 22:15:11 +02:00
zelophed
2b00602446 append, not add 2021-04-02 22:14:40 +02:00
simibubi
7193b5b0c2
Merge pull request #1149 from RakuGaki-MC/mc1.16/dev 
[mc1.16/dev] Update ja_jp.json
 2021-04-02 21:00:07 +02:00
simibubi
c5f3d4413d
Merge pull request #1322 from Peatral/mc1.15/dev 
Update de_de.json
 2021-04-02 20:58:29 +02:00
simibubi
b1bec1a1f9 Fix-ups 
- Filterless Creative Crates now serve as universal supply to schematic-driven deployers
- An attempt to force-update ejectors to not miss out on lid animations
- Fixed schematic-driven deployers not copying safe nbt data
 2021-04-02 19:22:41 +02:00
simibubi
c82896998c
Merge pull request #1216 from mrh0/mc1.15/dev 
Improved modding support
 2021-04-02 18:56:20 +02:00
Christof
1d31271bcb Update de_de.json 
Typos and Gabelstein  = Gabbro
 2021-04-02 18:23:11 +02:00
Christof
8dbfd4877e Update de_de.json 
Added the translations for a lot of blocks and a few advancements
 2021-04-02 18:07:53 +02:00
simibubi
6cfbf26f49 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-01 17:46:07 +02:00
simibubi
6c942be7f5 Too slippery 
- Sliding on contraptions now takes its slope into account
- Gantry Carriages are now less prone to break when moved near other blocks
 2021-04-01 17:43:39 +02:00
JozsefA
4b00562daf Port to 1.16 2021-03-31 21:44:16 -07:00
JozsefA
4908fc1b96 Change some obfuscated variable names 2021-03-31 21:29:17 -07:00
JozsefA
78fbb52ddc Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
 2021-03-31 21:17:01 -07:00
JozsefA
c21a8bcbde Fix startup crash on some AMD drivers. 
- The fix comes from Grondag's work on canvas.
 - Original commit: 820bf75409
 2021-03-31 20:53:02 -07:00
JozsefA
6ef88c3bd8 Fix some issues with instance rate limiting 2021-03-31 16:25:59 -07:00
JozsefA
b9f6a3b94e Instanced bearings 2021-03-31 16:19:58 -07:00
JozsefA
b743e00978 Better lazy arm instances 2021-03-31 16:18:53 -07:00
grimmauld
240510e3ee Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-31 21:18:43 +02:00
grimmauld
3cc8291b72 Simpler bouncing? Thanks @K1521 2021-03-31 21:18:33 +02:00
Snownee
c02193233b Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-04-01 01:46:52 +08:00
Snownee
ba63cc3e7f Fix tree fertilizer spreading podzol. Backport a440ab6 2021-04-01 01:43:06 +08:00
simibubi
b6857c2a20 Danger Polish 
- Fixed Crash when Deployer attempts to use Sand Paper
 2021-03-31 15:27:57 +02:00
simibubi
e82f9221b7 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 15:23:18 +02:00
simibubi
5b63f30df3 Abort Mission 
- Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed
 2021-03-31 15:22:41 +02:00
simibubi
2b4ef88fc1 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 14:50:16 +02:00
simibubi
d61e387916 The least performant option 
- Fixed slow merging of collision shapes
- Improved async handling of the collision shape merger
- BBs far away from an entity now get skipped in the collision cycle
 2021-03-31 14:27:27 +02:00
JozsefA
65d21c374b Fix crash making step sounds on servers. 2021-03-30 18:50:07 -07:00
simibubi
0bb18db4b6 Oriented bouncing and sliding 
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
 2021-03-31 03:16:29 +02:00
JozsefA
376c4e1cb0 Fix crash rendering mechanical crafters on contraptions. 2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
 2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a Change the locks 
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
 2021-03-30 14:14:58 -07:00
simibubi
8a4eaef015 Fix tooltip whitespace 2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:49:13 +02:00