6018 Commits

Author SHA1 Message Date
payonel
63012c7580 Merge branch 'agent-use-item' into agent-use-item-1.10
# Conflicts:
#	src/main/scala/li/cil/oc/server/agent/Inventory.scala
#	src/main/scala/li/cil/oc/server/agent/Player.scala
2018-02-26 16:07:24 -08:00
payonel
44234814ad detect fake player inventory changes
some mods may modify player inventory item arrays directly instead of through the container
also, this fixes other potential mods trying to update the inventory during actions
though unlikely, it would be supported now

closes #2751
2018-02-26 15:58:55 -08:00
payonel
44daa2d3ed Merge branch master-MC1.7.10 into master-MC1.10 2018-02-21 20:07:55 -08:00
payonel
615b2d496b make no-recipe failure more obvious in code 2018-02-21 20:01:49 -08:00
payonel
c054a0e598 Merge branch master-MC1.7.10 into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Cable.scala
2018-02-21 11:41:24 -08:00
payonel
add65a0f65 stop crafting when craft result changes
closes #2054
2018-02-21 11:36:31 -08:00
SquidDev
9c00fcfc28 Make cable collision box closer to cable shape 2018-02-20 08:12:48 -08:00
SquidDev
2e5cca8dbf Make cable collision box closer to cable shape 2018-02-20 08:03:02 -08:00
payonel
f11d384b51 follow fail pattern for addUser: throw on bad arg, nil on bad result
closes #2156
2018-02-20 07:44:41 -08:00
payonel
105e26b499 fix appeng export bus exportIntoSlot
closes #2658 for 1.10
2018-02-20 00:19:41 -08:00
payonel
8b949bd563 Merge branch master-MC1.7.10 into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 23:49:39 -08:00
payonel
e91b8c0971 add isCraftable to ae item data returned to the machine 2018-02-18 23:38:08 -08:00
payonel
166114dcc1 Merge branch master-MC1.7.10 into master-MC1.10
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 13:23:19 -08:00
payonel
4cffec4548 update forge for 1.7.10 2018-02-18 13:01:50 -08:00
payonel
b24e3e6f6b buffer mapped elements in cpu list so as to not lose equivalent cpus
closes #1921
2018-02-18 13:01:19 -08:00
payonel
37335d98b6 Merge branch master-MC1.7.10 into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 02:00:17 -08:00
payonel
aa84a24325 refactor ae get/set filter integration code
ae filtering now works on the exact same fields as returned to the lua state
closes #2718
2018-02-18 01:49:16 -08:00
TheCodex6824
26b127e74f Fixed drones not reclaiming their chunk tickets (#2727)
If a ticket is created with ForgeChunkManager.Type.ENTITY and bound to
an entity, then forge will actually load that entity's chunk before
returning its ticket. As a result, the drones were initializing their
components before the ticket was added to restoredTickets, so they
never actually reclaimed their ticket. Also added a log message to
detect if something like this happens again.
2018-02-13 16:08:18 -08:00
payonel
84ccbcef8a typo
closes #2743
2018-02-09 14:23:14 -08:00
payonel
6fd7fc07e1 require exact modifier key presses for key combos in /bin/edit 2018-02-04 18:42:54 -08:00
Brisingr Aerowing
de7868a5f8 Fixed #2313 (#2705)
Added getBlockState method to debug card world value
2018-02-01 17:31:51 -08:00
payonel
22c265dbaa Merge branch master-MC1.7.10 into master-MC1.10 2018-01-28 12:28:39 -08:00
payonel
03c0fda530 remove mem leak is load intercept 2018-01-26 20:47:02 -08:00
payonel
7e77662160 for clear line use gpu fill and not set 2018-01-21 18:03:42 -08:00
payonel
983185f5f2 fix vt code for scroll 2018-01-21 17:42:04 -08:00
payonel
f84fb968c3 Merge branch master-MC1.7.10 into master-MC1.10 2018-01-20 07:41:18 -08:00
payonel
28bf5b7cfe RIGHT ... setBackground returns number, number when paletted
derp
2018-01-20 07:37:23 -08:00
Anar Abdullayev
eec9173066 Update robot.names (#2607) 2018-01-11 06:26:15 -08:00
Ruukas
65fc2664f0 Added Robot names (#2555)
Got a little creative with some of them.. I have been interested in robots and robot movies for a while and got kind of caught in it. Most of robots/AIs I thought of were already in the list, but I think these would make some nice additions to the list.
2018-01-11 06:18:05 -08:00
Matthew Beeching
c78cf08b1c Update uuid.lua to generate RFC4122 valid version 4 UUIDs 2018-01-11 06:16:12 -08:00
SDPhantom
1a8cd8db99 Update robot.names
Added a couple Reaper names along with an ally from Mass Effect
2018-01-08 06:50:24 -08:00
payonel
4c0d17d6fb install cleaning
reverting a change from july 2017, that had the installer ignore a source if it came from the only rw candidate, when running the multi-selection util. I can see the irritation or confusion of the user when running the installer and it considers a secondary drive as a viable source candidate. Typically, a system would have additional hdds merely to store data. Typically the ro loot floppies are the desired source candidates. I believe the intention here was: "We have multiple source candidates, but only one is rw, thus it is probable that the rw candidate isn't actually intended for install" But I disagree, when testing custom floppies there will easily be one additional rw source.

Also, this change includes some additional command line clarification. If the system selects a source automatically, the first prompt the user sees is where to install. This can be jarring or confusing -- as the user doesn't know yet WHAT is being installed. In that case, we now display what is up for installation before asking where to install it.
2018-01-07 03:21:09 -08:00
payonel
fb1130cd5f Merge branch master-MC1.7.10 into master-MC1.10 2018-01-05 07:01:48 -08:00
payonel
8ef72f6bfe case fix 2018-01-05 07:01:36 -08:00
payonel
73c2eac5cf correct merge for carpeted capacitor 2018-01-03 05:50:28 -08:00
payonel
1b37905525 Merge remote-tracking branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/Localization.scala
#	src/main/scala/li/cil/oc/integration/Mods.scala
2018-01-02 21:30:59 -08:00
payonel
f8bfbf55b1 make component inventory components array even more lazy
allow a component inventory to define its inventory size from nbt even after the components array has been accessed. The array will appear to be size zero until initialized

closes #2522
2018-01-02 20:59:09 -08:00
payonel
8a4b1fa4f5 add sheep power
- add carpeted capacitor and configurations
- remove check for power providing mod
- remove localization about power check
2018-01-01 12:02:13 -08:00
payonel
dd3763f0e1 Merge branch master-MC1.7.10 into master-MC1.10 2017-12-31 10:49:31 -08:00
payonel
7432030d16 reduce glyph log noise 2017-12-31 10:42:25 -08:00
payonel
0d7743fcef item texture fixes for new items 2017-12-31 10:02:00 -08:00
payonel
f2eb66fa26 fix bad merge 2017-12-31 00:03:08 -08:00
payonel
7cab775901 allow setting chars to remove preceding wide chars 2017-12-30 22:45:26 -08:00
payonel
3b40a8e1b8 Merge branch master-MC1.7.10 into master-MC1.10
# Conflicts:
#	src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard.png
#	src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
#	src/main/resources/assets/opencomputers/textures/items/wlanCard.png
#	src/main/scala/li/cil/oc/Settings.scala
#	src/main/scala/li/cil/oc/common/Proxy.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
#	src/main/scala/li/cil/oc/common/tileentity/Relay.scala
#	src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
2017-12-26 07:49:29 -08:00
payonel
f9cd34580a fixing motion sensor again
stuff changed again between 1.7.10 to 1.10

closes #2692
2017-12-23 01:31:56 -08:00
payonel
d67156ed52 update font.hex (thanks @asie) and drop wcwidth.bin
now server loads glyph sizes by parsing font.hex

closes #2676
2017-12-22 07:48:50 -08:00
payonel
9c509508a7 French translation fixes
Thanks to @Naheulf
Closes #2061
2017-12-18 17:47:26 -08:00
Xyxen
fd9b81582b Fix runClient and runServer Gradle tasks (#2673)
Compile dependencies are placed on the runtime classpath by Gradle.
Because the compile configuration is set to extend from the provided
config, all of those dependencies are put on the runtime classpath as
well.

In this patch, provided is instead made a separate configuration, and
explicitly added to ONLY the compile classpath of the main sourceset.
2017-12-17 21:10:31 -08:00
payonel
719498163c fix relays save/load without wireless cards 2017-12-16 01:16:45 -08:00
Xyxen
62c661649b Fix wrong Gradle version being used on Travis CI (#2672)
Using the default Gradle install on Travis is dangerous, because a
version upgrade on their end could break the build. It's already broken
because the version of ForgeGradle the current script relies on expects
ScalaCompileOptions.setUseAnt to exist, but it was removed in Gradle 3.

This patch reconfigures Travis to use the Gradle wrapper instead, which
standardizes the version in use.
2017-12-15 21:06:48 -08:00