payonel
fd43521699
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-02-18 02:03:50 -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
83c39b9b05
Merge branch master-MC1.11 into master-MC1.12
2018-01-28 12:28:51 -08:00
payonel
57de51b8b8
Merge branch master-MC1.10 into master-MC1.11
2018-01-28 12:28:45 -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
f96108f1a2
Merge branch master-MC1.11 into master-MC1.12
2018-01-20 07:41:43 -08:00
payonel
b5ae93fc21
Merge branch master-MC1.10 into master-MC1.11
2018-01-20 07:41:37 -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
8015d1788c
use SlotCrafting and support repair crafting
2018-01-07 12:31:19 -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
1758e35e77
revert craft repair fix as it seems to break 1.12
2018-01-05 23:13:09 -08:00
payonel
639e460a3d
Merge branch master-MC1.11 into master-MC1.12
2018-01-05 07:15:50 -08:00
payonel
0073c26745
fixing case in docs
2018-01-05 07:15:48 -08:00
payonel
6563fe5b44
Merge branch master-MC1.10 into master-MC1.11
2018-01-05 07:04:03 -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
22f9af2ab0
Merge remote-tracking branch 'master-MC1.11' into master-MC1.12
2018-01-05 06:13:43 -08:00
payonel
47def83811
merge fixes for carpet capacitors
2018-01-05 05:57:58 -08:00
payonel
da9a68fc2e
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/en_US.lang
# src/main/scala/li/cil/oc/Constants.scala
# src/main/scala/li/cil/oc/Localization.scala
# src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
2018-01-03 07:02:55 -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
2d611528c9
Merge branch master-MC1.11 into master-MC1.12
2017-12-31 10:49:44 -08:00
payonel
f04c60d2c9
Merge branch master-MC1.10 into master-MC1.11
2017-12-31 10:49:42 -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
14933e87d8
Merge branch master-MC1.11 to master-MC1.12
2017-12-31 10:32:34 -08:00
payonel
6ccf337996
fixing more merge issues
...
# Conflicts:
# src/main/resources/assets/opencomputers/models/item/wlanCard.json
# src/main/resources/assets/opencomputers/models/item/wlanCard1.json
# src/main/resources/assets/opencomputers/models/item/wlancard.json
2017-12-31 10:31:05 -08:00
payonel
0d7743fcef
item texture fixes for new items
2017-12-31 10:02:00 -08:00
payonel
28e09825e1
Merge branch master-MC1.11 into master-MC1.12
2017-12-31 00:35:20 -08:00
payonel
8be2816b0c
fix bad merge
2017-12-31 00:34:18 -08:00
payonel
6caf59fffa
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/init/Items.scala
2017-12-31 00:23:52 -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
3b4d077e97
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/MotionSensor.scala
2017-12-26 16:45:44 -08:00
payonel
5a6d2b2d5a
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# build.gradle
# src/main/resources/assets/opencomputers/doc/de_DE/item/index.md
# src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/de_de/item/wlancard.md
# src/main/resources/assets/opencomputers/doc/en_US/item/index.md
# src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/en_us/item/wlancard.md
# src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/fr_fr/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/ru_ru/item/wlanCard.md
# src/main/resources/assets/opencomputers/lang/en_US.lang
# src/main/resources/assets/opencomputers/lang/fr_FR.lang
# src/main/resources/assets/opencomputers/lang/it_IT.lang
# src/main/resources/assets/opencomputers/lang/pt_BR.lang
# src/main/resources/assets/opencomputers/lang/pt_PT.lang
# src/main/resources/assets/opencomputers/lang/ru_RU.lang
# src/main/resources/assets/opencomputers/lang/zh_CN.lang
# src/main/resources/assets/opencomputers/lang/zh_TW.lang
# src/main/resources/assets/opencomputers/recipes/default.recipes
# src/main/resources/assets/opencomputers/recipes/gregtech.recipes
# src/main/resources/assets/opencomputers/recipes/hardmode.recipes
# src/main/resources/assets/opencomputers/recipes/peaceful.recipes
# src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
# src/main/resources/assets/opencomputers/textures/items/wlanCard.png
# src/main/resources/assets/opencomputers/textures/items/wlancard.png
# src/main/scala/li/cil/oc/Constants.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/LinkedCard.scala
# src/main/scala/li/cil/oc/server/component/NetworkCard.scala
# src/main/scala/li/cil/oc/util/FontUtils.scala
2017-12-26 16:42:22 -08:00
