Commit Graph

8099 Commits

Author SHA1 Message Date
Darkness#3729
3a91460e24 Fix (#6414) 2021-12-08 10:01:02 -05:00
Matthew (or Maya) Peng
8e89b24e5b unprivate countOre (#6410) 2021-12-08 00:02:52 -05:00
buthed010203
5c3ecaabb5 Fix incorrect return value (#6401)
* Fix incorrect return value

the javadoc is a lie

* Update Administration.java
2021-12-04 20:41:29 -05:00
Matthew (or Maya) Peng
5ea4688e88 get by name (#6396) 2021-12-02 15:43:31 -05:00
Matthew (or Maya) Peng
8cb830ba41 Make MoveLightningAbility alternating a boolean (#6390)
* Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)"

This reverts commit e1685ef46c.

* boolean `alternate`

* Better Javadoc description
2021-11-29 23:05:35 -05:00
Matthew (or Maya) Peng
3819e327e9 Grammar (#6383)
* Grammar

* English is a terrible language
2021-11-29 21:15:15 -05:00
Anuken
51fe07daef Backported EnumSet changes 2021-11-29 20:15:13 -05:00
Anuken
dc0904a6c7 Merge remote-tracking branch 'origin/master' 2021-11-29 20:14:05 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
buthed010203
c055407249 Fix editor camera panning (#6380)
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
router
4eca2b4b0b Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
d4ccbaa6df Merge remote-tracking branch 'origin/master' 2021-11-25 11:33:50 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -05:00
MrDuck557
ccfd062c85 ParticleEffect Rotation (#6323)
* Additive

* ternary

* copypasta

I missed a total of 4 instances

* anuke has spoken

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
2021-11-25 11:24:34 -05:00
Anuken
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -05:00
MrDuck557
25f98fdeb0 engineColor (#6360)
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163 blinkSize (#6359)
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
2021-11-22 10:08:57 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
hortiSquash
fd1678dbc9 Unloading into plast belts - bug fix (#6347)
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
2021-11-17 09:35:36 -05:00
Matthew Peng
4a7774fe5a Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00
Anuken
f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
MrDuck557
1c4e6b77b4 DestroyBullet (#6311)
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
2021-11-09 18:10:28 -05:00
LawrenceLin2333
68f8668162 Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -05:00
Matthew Peng
51730556a5 Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
Goobrr
c2b5e4b82b Show internal names (#6317)
* internal names

* enableConsole

* how did this get left out
2021-11-08 19:25:17 -05:00
JrTRinny
c96b723aaa more delectable selection pane (#6318) 2021-11-08 18:12:23 -05:00
Anuken
af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken
656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Matthew Peng
1dd0f67daf recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -05:00
Matthew Peng
fff7283568 Pointless if (#6310) 2021-11-06 21:12:38 -04:00
Anuken
24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken
189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken
9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Matthew Peng
7884bbd299 stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -04:00
Matthew Peng
996193ea69 payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Matthew Peng
3574b982ab misspelling (#6291) 2021-11-02 22:03:47 -04:00
Matthew Peng
a438be7fcd when and why was this hardcoded (#6289) 2021-11-02 20:22:07 -04:00
Anuken
b418afed63 Added WorldLabel entity for better server-side labels 2021-11-02 10:03:44 -04:00
Anuken
99d30b6351 Fixed #6287 2021-11-02 09:04:37 -04:00
Anuken
c4dc7e91f3 Merge remote-tracking branch 'origin/master' 2021-11-02 00:24:33 -04:00
Anuken
48b9bbc317 Less thruster rotation 2021-11-02 00:24:28 -04:00
hortiSquash
134ef9e00e hortiloaders hotfix randomness (#6283)
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
2021-11-01 17:34:40 -04:00
Anuken
f5c09845ae Fixed #6282 2021-11-01 15:29:07 -04:00
Anuken
72e3461745 indent 2021-11-01 15:15:13 -04:00