]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
5 years agoMerge branch 'master' into Mario/qcphysics
Mario [Sun, 29 Sep 2019 08:45:47 +0000 (18:45 +1000)]
Merge branch 'master' into Mario/qcphysics

5 years agoMerge branch 'martin-t/cvar-descriptions' into 'master'
Mario [Sun, 29 Sep 2019 08:33:22 +0000 (08:33 +0000)]
Merge branch 'martin-t/cvar-descriptions' into 'master'

Improve cvar descriptions, add ca to default votable modes

See merge request xonotic/xonotic-data.pk3dir!717

5 years agoMerge branch 'martin-t/globals' into 'master'
Mario [Sun, 29 Sep 2019 08:29:53 +0000 (08:29 +0000)]
Merge branch 'martin-t/globals' into 'master'

Deglobalization - part 1

See merge request xonotic/xonotic-data.pk3dir!623

5 years agoMerge branch 'master' into martin-t/cvar-descriptions
Martin Taibr [Sat, 28 Sep 2019 16:58:52 +0000 (18:58 +0200)]
Merge branch 'master' into martin-t/cvar-descriptions

5 years agoAllow removing waypoints in the air and seeing jumppad/telepport waypoint links ...
terencehill [Sat, 28 Sep 2019 10:11:22 +0000 (12:11 +0200)]
Allow removing waypoints in the air and seeing jumppad/telepport waypoint links (at some point somehow a commit of mine broke this feature)

5 years agoDon't allow voice messages to function while spectating or observing
Mario [Sat, 28 Sep 2019 08:41:29 +0000 (18:41 +1000)]
Don't allow voice messages to function while spectating or observing

5 years agoWhitelist sv_mapchange_delay
Mario [Sat, 28 Sep 2019 00:57:47 +0000 (10:57 +1000)]
Whitelist sv_mapchange_delay

5 years agoDon't prevent timelimit values at or below 0, instead rely on timelimit_min
Mario [Fri, 27 Sep 2019 15:43:58 +0000 (01:43 +1000)]
Don't prevent timelimit values at or below 0, instead rely on timelimit_min

5 years agoRestrict the timelimit vote to values between timelimit_min and timelimit_max
Mario [Fri, 27 Sep 2019 15:29:07 +0000 (01:29 +1000)]
Restrict the timelimit vote to values between timelimit_min and timelimit_max

5 years agoMerge branch 't0uYK8Ne/set_slick_friction' into 'master'
Mario [Fri, 27 Sep 2019 15:12:03 +0000 (15:12 +0000)]
Merge branch 't0uYK8Ne/set_slick_friction' into 'master'

Set CPMA, Q2, Q3, and Warsow slick friction to 0

See merge request xonotic/xonotic-data.pk3dir!624

5 years agoMerge branch 'martin-t/echo' into 'master'
Mario [Fri, 27 Sep 2019 15:07:13 +0000 (15:07 +0000)]
Merge branch 'martin-t/echo' into 'master'

Hide 2 redundant echos (tiny MR)

See merge request xonotic/xonotic-data.pk3dir!476

5 years agoMerge branch 'master' into martin-t/echo
Mario [Fri, 27 Sep 2019 14:43:33 +0000 (00:43 +1000)]
Merge branch 'master' into martin-t/echo

5 years agoUpdate sv_mapchange_delay description again
Mario [Fri, 27 Sep 2019 12:30:00 +0000 (22:30 +1000)]
Update sv_mapchange_delay description again

5 years agoAdd a description to sv_mapchange_delay, fix the use of tabs between some cvar descri...
Mario [Fri, 27 Sep 2019 12:26:58 +0000 (22:26 +1000)]
Add a description to sv_mapchange_delay, fix the use of tabs between some cvar descriptions

5 years agoUpdate g_movement_highspeed description
Mario [Fri, 27 Sep 2019 12:19:34 +0000 (22:19 +1000)]
Update g_movement_highspeed description

5 years agoRewrite g_movement_highspeed_q3_compat description to better clarify its intentions
Mario [Fri, 27 Sep 2019 12:09:12 +0000 (22:09 +1000)]
Rewrite g_movement_highspeed_q3_compat description to better clarify its intentions

5 years agoMerge branch 'master' into martin-t/cvar-descriptions
Martin Taibr [Thu, 26 Sep 2019 13:05:44 +0000 (15:05 +0200)]
Merge branch 'master' into martin-t/cvar-descriptions

5 years agoMerge branch 'AriosJentu/DisconnectDialog' into 'master'
Mario [Thu, 26 Sep 2019 11:33:20 +0000 (11:33 +0000)]
Merge branch 'AriosJentu/DisconnectDialog' into 'master'

Move disconnect dialog from multiplayer to main menu

See merge request xonotic/xonotic-data.pk3dir!687

5 years agoMerge branch 'morosophos/defrag-haste2' into 'master'
Mario [Thu, 26 Sep 2019 11:24:45 +0000 (11:24 +0000)]
Merge branch 'morosophos/defrag-haste2' into 'master'

Rebase q3 haste changes on top of Mario's buff timers work

Closes #2228

See merge request xonotic/xonotic-data.pk3dir!710

5 years agoMerge branch 'martin-t/tips' into 'master'
Mario [Thu, 26 Sep 2019 10:58:27 +0000 (10:58 +0000)]
Merge branch 'martin-t/tips' into 'master'

Improve tips

See merge request xonotic/xonotic-data.pk3dir!664

5 years agoMinor tweak
Mario [Thu, 26 Sep 2019 10:57:00 +0000 (20:57 +1000)]
Minor tweak

5 years agoMerge branch 'martin-t/ctf-autoreturn' into 'master'
Mario [Thu, 26 Sep 2019 10:47:09 +0000 (10:47 +0000)]
Merge branch 'martin-t/ctf-autoreturn' into 'master'

Suggest increasing ctf autoreturn

See merge request xonotic/xonotic-data.pk3dir!691

5 years agoMerge branch 'martin-t/AMMO' into 'master'
Mario [Thu, 26 Sep 2019 04:49:24 +0000 (04:49 +0000)]
Merge branch 'martin-t/AMMO' into 'master'

Rename misleading const, fix overkill

See merge request xonotic/xonotic-data.pk3dir!692

5 years agoMerge branch 'martin-t/vbots' into 'master'
Mario [Wed, 25 Sep 2019 23:54:08 +0000 (23:54 +0000)]
Merge branch 'martin-t/vbots' into 'master'

Add bots and nobots votes, set default bot skill to 8 (from 1)

See merge request xonotic/xonotic-data.pk3dir!668

5 years agoDon't use set on the skill cvar, as it's an engine cvar and therefore predefined
Mario [Wed, 25 Sep 2019 23:53:33 +0000 (09:53 +1000)]
Don't use set on the skill cvar, as it's an engine cvar and therefore predefined

5 years agoMerge branch 'morosophos/remove-buff-spawn-shield' into 'master'
Mario [Wed, 25 Sep 2019 23:35:42 +0000 (23:35 +0000)]
Merge branch 'morosophos/remove-buff-spawn-shield' into 'master'

Remove the hardcoded 0.5sec buff shield assigned to newly spawned players

See merge request xonotic/xonotic-data.pk3dir!712

5 years agoMerge branch 'morosophos/packer-doors-always-open' into 'master'
Mario [Wed, 25 Sep 2019 23:33:49 +0000 (23:33 +0000)]
Merge branch 'morosophos/packer-doors-always-open' into 'master'

Add a sv_doors_always_open cvar which will keep open doors open. Useful for public defrag servers.

See merge request xonotic/xonotic-data.pk3dir!711

5 years agoRemove duplicate cvar override
Morosophos [Wed, 25 Sep 2019 10:08:13 +0000 (13:08 +0300)]
Remove duplicate cvar override

g_movement_highspeed_q3_compat is overriden in ruleset-XDF.cfg, remove
it from physicsXDF.cfg

5 years agoSet g_movement_highspeed_q3_compat 1 in ruleset-XDF
Morosophos [Wed, 25 Sep 2019 09:15:02 +0000 (12:15 +0300)]
Set g_movement_highspeed_q3_compat 1 in ruleset-XDF

5 years agoRemove separate config for buffs
Morosophos [Wed, 25 Sep 2019 09:13:33 +0000 (12:13 +0300)]
Remove separate config for buffs

Add modified cvars to rulest-XDF.cfg instead.

5 years agoEnsure that fast doors don't open slower with sv_doors_always_open
Morosophos [Wed, 25 Sep 2019 09:00:39 +0000 (12:00 +0300)]
Ensure that fast doors don't open slower with sv_doors_always_open

5 years agocomment about doxygen
Martin Taibr [Wed, 25 Sep 2019 08:38:20 +0000 (10:38 +0200)]
comment about doxygen

5 years agoMerge branch 'martin-t/defaults' into 'master'
Mario [Tue, 24 Sep 2019 10:44:56 +0000 (10:44 +0000)]
Merge branch 'martin-t/defaults' into 'master'

Defaults for gamemodes

See merge request xonotic/xonotic-data.pk3dir!662

5 years agogive up on KA changes
Martin Taibr [Tue, 24 Sep 2019 10:12:02 +0000 (12:12 +0200)]
give up on KA changes

5 years agoUpdate crosshair_hittest_scale description
Mario [Mon, 23 Sep 2019 10:50:31 +0000 (20:50 +1000)]
Update crosshair_hittest_scale description

5 years agoDon't show hittest effects on enemies (it can't show all valid targets, so it doesn...
Mario [Mon, 23 Sep 2019 10:43:28 +0000 (20:43 +1000)]
Don't show hittest effects on enemies (it can't show all valid targets, so it doesn't serve much purpose)

5 years agoMerge branch 'master' into Mario/qcphysics
Mario [Wed, 18 Sep 2019 22:03:46 +0000 (08:03 +1000)]
Merge branch 'master' into Mario/qcphysics

5 years agoMerge branch 'martin-t/xdf-mg' into 'master'
Martin Taibr [Wed, 18 Sep 2019 11:44:52 +0000 (11:44 +0000)]
Merge branch 'martin-t/xdf-mg' into 'master'

Fix "infinite" burst happening when reload ammo was 0 (as in XDF)

See merge request xonotic/xonotic-data.pk3dir!718

5 years agofix "infinite" burst happening when reload ammo was 0 (as in XDF) 718/head
Martin Taibr [Wed, 18 Sep 2019 09:54:20 +0000 (11:54 +0200)]
fix "infinite" burst happening when reload ammo was 0 (as in XDF)

5 years agoMerge branch 'master' into martin-t/vbots
Martin Taibr [Wed, 18 Sep 2019 03:14:23 +0000 (05:14 +0200)]
Merge branch 'master' into martin-t/vbots

5 years agoreorganize rcon_restricted_commands to match normal+master votes order
Martin Taibr [Wed, 18 Sep 2019 03:13:46 +0000 (05:13 +0200)]
reorganize rcon_restricted_commands to match normal+master votes order

5 years agosome more descriptions
Martin Taibr [Tue, 17 Sep 2019 08:47:52 +0000 (10:47 +0200)]
some more descriptions

5 years agoimprove cvar descriptions, add ca to default votable modes
Martin Taibr [Tue, 17 Sep 2019 05:36:29 +0000 (07:36 +0200)]
improve cvar descriptions, add ca to default votable modes

5 years agoApply default values in code to the gameplayfix cvars
Mario [Sun, 15 Sep 2019 17:45:07 +0000 (03:45 +1000)]
Apply default values in code to the gameplayfix cvars

5 years agoMerge branch 'master' into Mario/qcphysics
Mario [Sun, 15 Sep 2019 06:10:17 +0000 (16:10 +1000)]
Merge branch 'master' into Mario/qcphysics

5 years agoMake stepnormal available to the above functions, fixes some discrepancies in QC...
Mario [Sun, 15 Sep 2019 06:09:28 +0000 (16:09 +1000)]
Make stepnormal available to the above functions, fixes some discrepancies in QC physics

5 years agoMerge branch 'martin-t/qc2rust' into 'master'
Mario [Sat, 14 Sep 2019 20:36:36 +0000 (20:36 +0000)]
Merge branch 'martin-t/qc2rust' into 'master'

Qc2rust branch with tiny changes

See merge request xonotic/xonotic-data.pk3dir!716

5 years agorestore var name so branch can be merged 716/head
Martin Taibr [Sat, 14 Sep 2019 18:31:09 +0000 (20:31 +0200)]
restore var name so branch can be merged

5 years agoOne more braket reducing
Morosophos [Fri, 13 Sep 2019 13:06:47 +0000 (16:06 +0300)]
One more braket reducing

5 years agoReduce layer of brackets
Morosophos [Fri, 13 Sep 2019 13:04:22 +0000 (16:04 +0300)]
Reduce layer of brackets

5 years agoMerge branch 'martin-t/seta' into 'master'
Mario [Fri, 13 Sep 2019 12:51:28 +0000 (12:51 +0000)]
Merge branch 'martin-t/seta' into 'master'

Seta -> set in server configs

See merge request xonotic/xonotic-data.pk3dir!700

5 years agoMerge branch 'cloudwalk9/mgburstfix' into 'master'
Martin Taibr [Thu, 12 Sep 2019 21:34:17 +0000 (21:34 +0000)]
Merge branch 'cloudwalk9/mgburstfix' into 'master'

Improve machinegun burst fire

This fixes #2215

See merge request xonotic/xonotic-data.pk3dir!656

5 years agofix burst when no ammo for reload, update hash
Martin Taibr [Thu, 12 Sep 2019 21:19:55 +0000 (23:19 +0200)]
fix burst when no ammo for reload, update hash

5 years agocleanup
Martin Taibr [Thu, 12 Sep 2019 20:05:19 +0000 (22:05 +0200)]
cleanup

5 years agoMerge branch 'master' into cloudwalk9/mgburstfix
Martin Taibr [Thu, 12 Sep 2019 19:21:25 +0000 (21:21 +0200)]
Merge branch 'master' into cloudwalk9/mgburstfix

5 years agoTransifex autosync
Rudolf Polzer [Thu, 12 Sep 2019 05:25:13 +0000 (07:25 +0200)]
Transifex autosync

5 years agodefault skill 8 (poll)
Martin Taibr [Wed, 11 Sep 2019 23:33:20 +0000 (01:33 +0200)]
default skill 8 (poll)

5 years agotip about teamdmg
Martin Taibr [Wed, 11 Sep 2019 23:29:39 +0000 (01:29 +0200)]
tip about teamdmg

5 years agoremove redundant cvar in OK ruleset
Martin Taibr [Wed, 11 Sep 2019 23:09:32 +0000 (01:09 +0200)]
remove redundant cvar in OK ruleset

5 years agoMerge branch 'Mario/spike_removal' into 'master'
Mario [Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)]
Merge branch 'Mario/spike_removal' into 'master'

Merge branch Mario/spike_removal (XS merge request)

See merge request xonotic/xonotic-data.pk3dir!714

5 years agoDon't dequeue the projectile if it's already been done 714/head
Mario [Tue, 10 Sep 2019 11:19:46 +0000 (21:19 +1000)]
Don't dequeue the projectile if it's already been done

5 years agoUse destructors to dequeue crylink spikes, fixes some potential crashes from unsafe...
Mario [Tue, 10 Sep 2019 10:49:13 +0000 (20:49 +1000)]
Use destructors to dequeue crylink spikes, fixes some potential crashes from unsafe spike removal

5 years agoRemove the hardcoded 0.5sec buff shield assigned to newly spawned players
Morosophos [Mon, 9 Sep 2019 20:59:05 +0000 (23:59 +0300)]
Remove the hardcoded 0.5sec buff shield assigned to newly spawned players

5 years agoAdd a sv_doors_always_open cvar which will keep open doors en. Useful for public...
Morosophos [Mon, 9 Sep 2019 20:46:57 +0000 (23:46 +0300)]
Add a sv_doors_always_open cvar which will keep open doors en. Useful for public defrag servers.

5 years agoRebase q3 haste changes on top of Mario's buff timers work
Morosophos [Mon, 9 Sep 2019 20:25:11 +0000 (23:25 +0300)]
Rebase q3 haste changes on top of Mario's buff timers work

5 years agoDisable sv_cullentities_trace_eyejitter (spams the network with item updates)
Mario [Sat, 7 Sep 2019 17:04:36 +0000 (03:04 +1000)]
Disable sv_cullentities_trace_eyejitter (spams the network with item updates)

5 years agoDo a trace when throwing the flag to ensure it isn't placed inside a solid ceiling
Mario [Sat, 7 Sep 2019 15:10:03 +0000 (01:10 +1000)]
Do a trace when throwing the flag to ensure it isn't placed inside a solid ceiling

5 years agoBot waypoints: fix creation of a jump / support link from wp A to wp B breaking hardw...
terencehill [Sat, 7 Sep 2019 14:30:32 +0000 (16:30 +0200)]
Bot waypoints: fix creation of a jump / support link from wp A to wp B breaking hardwired links of wp B

5 years agoFix g_rocket_flying_disabledelays (below 0 means proximity, not instant)
Mario [Sat, 7 Sep 2019 12:23:21 +0000 (22:23 +1000)]
Fix g_rocket_flying_disabledelays (below 0 means proximity, not instant)

5 years agoRestore XPM modname to the XPM Testing balance configuration
Mario [Sat, 7 Sep 2019 12:04:08 +0000 (22:04 +1000)]
Restore XPM modname to the XPM Testing balance configuration

5 years agoAllow g_rocket_flying_disabledelays to be changed without affecting purity
Mario [Sat, 7 Sep 2019 11:36:52 +0000 (21:36 +1000)]
Allow g_rocket_flying_disabledelays to be changed without affecting purity

5 years agoFix g_rocket_flying_disabledelays adding a slight delay to rocket detonation
Mario [Sat, 7 Sep 2019 11:13:46 +0000 (21:13 +1000)]
Fix g_rocket_flying_disabledelays adding a slight delay to rocket detonation

5 years agoReduce vampire buff's health steal amount, reduce the amount of damage the vengeance...
Mario [Sat, 7 Sep 2019 11:09:05 +0000 (21:09 +1000)]
Reduce vampire buff's health steal amount, reduce the amount of damage the vengeance buff reflects, reduce luck buff's damage multiplier to double damage

5 years agoApply invisibility to crosshair chase, fixes players becoming more visible when their...
Mario [Sat, 7 Sep 2019 10:57:25 +0000 (20:57 +1000)]
Apply invisibility to crosshair chase, fixes players becoming more visible when their crosshair is obstructed

5 years agoAllow admins to use the rocket flying mutator without breaking purity
Mario [Sat, 7 Sep 2019 10:02:20 +0000 (20:02 +1000)]
Allow admins to use the rocket flying mutator without breaking purity

5 years agoGive g_balance_devastator_remote_jump_radius a default value now that it isn't the...
Mario [Sat, 7 Sep 2019 08:58:46 +0000 (18:58 +1000)]
Give g_balance_devastator_remote_jump_radius a default value now that it isn't the controller for rocket flying, restore rocket flying in the balance configurations that had it

5 years agoAdd g_balance_devastator_remote_jump as a controller cvar for rocket flying, force...
Mario [Sat, 7 Sep 2019 08:55:57 +0000 (18:55 +1000)]
Add g_balance_devastator_remote_jump as a controller cvar for rocket flying, force it enabled in the rocket flying mutator

5 years agoUpdate gameplay hash
Mario [Sat, 7 Sep 2019 08:13:41 +0000 (18:13 +1000)]
Update gameplay hash

5 years agoEnable Devastator remote jumping in the Testing balance, as per !708
Mario [Sat, 7 Sep 2019 07:45:43 +0000 (17:45 +1000)]
Enable Devastator remote jumping in the Testing balance, as per !708

5 years agoAdjust Crylink's secondary attack to be a faster spread-out shot in the Testing balan...
Mario [Sat, 7 Sep 2019 07:31:34 +0000 (17:31 +1000)]
Adjust Crylink's secondary attack to be a faster spread-out shot in the Testing balance, as per !614

5 years agoIncrease machinegun solidpenetration to 63 in the Testing balance, as per !709
Mario [Sat, 7 Sep 2019 07:08:24 +0000 (17:08 +1000)]
Increase machinegun solidpenetration to 63 in the Testing balance, as per !709

5 years agoMerge branch 'martin-t/mg-solidpen' into 'master'
Mario [Sat, 7 Sep 2019 07:00:41 +0000 (07:00 +0000)]
Merge branch 'martin-t/mg-solidpen' into 'master'

Increase MG solidpenetration

See merge request xonotic/xonotic-data.pk3dir!619

5 years agoRestore original solid penetration settings (to be applied in a separate branch)
Mario [Sat, 7 Sep 2019 06:59:49 +0000 (16:59 +1000)]
Restore original solid penetration settings (to be applied in a separate branch)

5 years agoDisable Vortex charge and reduce damage to 65 in the Testing balance, as per !704
Mario [Sat, 7 Sep 2019 06:50:07 +0000 (16:50 +1000)]
Disable Vortex charge and reduce damage to 65 in the Testing balance, as per !704

5 years agoEnable Crylink linkexplode, as per !706
Mario [Sat, 7 Sep 2019 06:48:07 +0000 (16:48 +1000)]
Enable Crylink linkexplode, as per !706

5 years agoInclude a Testing balance configuration to allow testing upcoming balance changes...
Mario [Sat, 7 Sep 2019 06:47:22 +0000 (16:47 +1000)]
Include a Testing balance configuration to allow testing upcoming balance changes without affecting purity

5 years agoMerge branch 'Mario/warmup_end_hook'
Mario [Sat, 7 Sep 2019 06:25:34 +0000 (16:25 +1000)]
Merge branch 'Mario/warmup_end_hook'

5 years agoAdd a server hook alias for the end of warmup stage (when the real match is going...
Mario [Sat, 7 Sep 2019 06:17:01 +0000 (16:17 +1000)]
Add a server hook alias for the end of warmup stage (when the real match is going to begin)

5 years agoMerge branch 'martin-t/degotofication' into 'master'
Mario [Sat, 7 Sep 2019 05:21:52 +0000 (05:21 +0000)]
Merge branch 'martin-t/degotofication' into 'master'

Remove some gotos

See merge request xonotic/xonotic-data.pk3dir!707

5 years agoFix cl_hitsound description
Mario [Fri, 6 Sep 2019 12:44:05 +0000 (22:44 +1000)]
Fix cl_hitsound description

5 years agoAllow g_player_brightness changes without affecting purity
Mario [Fri, 6 Sep 2019 00:53:45 +0000 (10:53 +1000)]
Allow g_player_brightness changes without affecting purity

5 years agoMove this.goalcurrent check inside havocbot_bunnyhop
terencehill [Wed, 4 Sep 2019 20:30:50 +0000 (22:30 +0200)]
Move this.goalcurrent check inside havocbot_bunnyhop

5 years agoBot AI: clear current route if goalcurrent has been freed; it should avoid occasional...
terencehill [Wed, 4 Sep 2019 20:28:04 +0000 (22:28 +0200)]
Bot AI: clear current route if goalcurrent has been freed; it should avoid occasional "checkpvs: can not check free entity" warnings generated by the bunnyhop code

5 years agoremove some easy gotos 707/head
Martin Taibr [Wed, 4 Sep 2019 17:25:48 +0000 (19:25 +0200)]
remove some easy gotos

5 years agoAllow g_tdm_on_dm_maps and g_duel_not_dm_maps to be changed without affecting purity...
Mario [Wed, 4 Sep 2019 15:27:30 +0000 (01:27 +1000)]
Allow g_tdm_on_dm_maps and g_duel_not_dm_maps to be changed without affecting purity (gameplay irrelevant)

5 years agoAdd an option to prevent Deathmatch maps showing up in Duel (off by default since...
Mario [Wed, 4 Sep 2019 15:20:03 +0000 (01:20 +1000)]
Add an option to prevent Deathmatch maps showing up in Duel (off by default since no maps list support for Duel)

5 years agoDon't perform antilag takeback on every single bullet in the Shotgun attack
Mario [Wed, 4 Sep 2019 13:09:20 +0000 (23:09 +1000)]
Don't perform antilag takeback on every single bullet in the Shotgun attack

5 years agoInclude some sane options in the cl_maxfps slider and increase the default to 250
Mario [Wed, 4 Sep 2019 11:44:44 +0000 (21:44 +1000)]
Include some sane options in the cl_maxfps slider and increase the default to 250

5 years agoDisable cl_maxfps_alwayssleep (Xonotic caps FPS by default, this setting is not neces...
Mario [Wed, 4 Sep 2019 11:24:09 +0000 (21:24 +1000)]
Disable cl_maxfps_alwayssleep (Xonotic caps FPS by default, this setting is not necessary anymore)

5 years agoFix items not providing all their resources if they have multiple
Mario [Wed, 4 Sep 2019 10:35:09 +0000 (20:35 +1000)]
Fix items not providing all their resources if they have multiple